Merge branch 'master' of https://github.com/hitmayu/hit_software_engineer_dbs into hitmayu-master

Conflicts:
	app/cfg/routes.cfg
	app/ui/index.html