Changed models etc so they reflect the changes made in the database structure
Rebuild API for better handling of null-values (and general API improvement)
Updated upgrade script
Install script updated
Merge branch 'dev_db' into dev

Conflicts:
	js/file.js