last day edited 1
second day 1
Merge branch 'master' of https://github.com/evotech/ACC

Conflicts:
	app/styles/index.tss
	app/views/approval.xml
	app/views/index.xml