test commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	timetrack/bin/classes/.gitignore
	timetrack/gen/.gitignore
	timetrack/res/layout/activity_main.xml