Merge branch 'develop'

Conflicts:
	db/development.sqlite3
fix