Merge branch 'hotfix/no_coffescript' into develop
Merge branch 'hotfix/v_0.3.1' into develop
Merge branch 'hotfix/readme_tweak' into develop
Merge branch 'hotfix/readme_fix' into develop
Merge branch 'develop' of git.wetzelbemm.com:common-resources/ressourcen-tool into develop
Filter projects by department
Merge branch 'hotfix/filter_projects' into develop
move calendar to separate  model
structure tweaking
added first_day and last_day methods
Merge branch 'develop' of git.wetzelbemm.com:common-resources/ressourcen-tool into develop
Merge branch 'feature/restructure' into develop

Conflicts:
	app/controllers/jobs_controller.rb
Merge branch 'release/v_0.3.5'
Delete job when its project or ressource gets deleted
filter project list
edited readme
Merge branch 'feature/Major_bugfixes' into develop
Merge branch 'release/v_0.3.6'
finally got rid of the global variables and did some minor cleanup
Merge branch 'hotfix/clean_up_02'