http://jira.aplana.com/browse/APLANATS-1151
http://jira.aplana.com/browse/APLANATS-1183
http://jira.aplana.com/browse/APLANATS-1094
http://jira.aplana.com/browse/APLANATS-1094 доработка макетов отчетов excel
Merge branch 'master' of https://github.com/itru/timesheet
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/velocity/report.vm
Merge remote-tracking branch 'origin/master'