git commit before merge
Merge remote-tracking branch 'upstream/master'

Conflicts:
	rmss/conf/evolutions/default/1.sql
	rmss/conf/routes
Merge branch 'master' of git://github.com/daipp/wasu-rmss into daipp-master

Conflicts:
	rmss/conf/routes
merge
local db
meger