Merge branch 'master' of github.com:digitalnatives/redmine_hr into holiday_workflow
Build task for deployment.
Fix tests.
fixing typo
Merge pull request #8 from digitalnatives/deployment

Deployment (and some stuff.......)
Merge pull request #3 from digitalnatives/holiday_workflow

Holiday Workflow
Merge pull request #6 from digitalnatives/mails

Mails
Merge pull request #7 from digitalnatives/reporting

Reporting
redmine admins are not admins on hr from now
Merge branch 'master' of github.com:digitalnatives/redmine_hr into hungarian_module

Conflicts:
	.gitignore
	app/views/hr/index.html.erb
	lib/deps.rb