Trying to get DB work by removing timestamp
Merge branch 'master' of https://github.com/roikonen/MissaJuna.git

Conflicts:
	conf/evolutions/default/1.sql