Database update
Merge branch 'master' into testing

Conflicts:
	log/development.log