Deleted sensitive data!
Merge branch 'master' of https://github.com/mykolasopushynskyi/TimeCard

Conflicts:
	app/controllers/RallyService.java