Merge branch 'master' into concurrent-editing

So, here's the deal:
 * The meat of [concurrent-editing]:Form.class got merged into [master]:DB.class
 * The string-generation stuff in [concurrent-editing]:Form.class didn't fit
   nicely anywhere anymore, so I got rid of it by makeing datatype explicit.
    * Users.class: declare datatypes explicitly in attrib()
    * index.html.php: use this new explicit data
 * style.scss: add a .small, which we can do because of the datatypes thing.

Conflicts:
	src/controllers/Users.class.php

0 files changed, 0 insertions, 0 deletions