Let's make it run
Starting
Merge branch 'master' into UI

Conflicts:
	weeklyc.db
Add login template