UI 1
Merge branch 'master' of https://github.com/projectus/belloh

Conflicts:
	db/development.sqlite3
	log/development.log
m
UI1