Merge pull request #11 from klaseskilson/feature/booking

Feature/booking, done!
Fix for broken error page image link
Use inline dependency injection on CalendarCtrl, fixes #16
Add google analytics
Added authentication checks for users so that regular users cant access admin pages. Also fixed a redirect in the news_controller so it redirects to the correct page
Fix access to drinks, add compression gems
Merge branch 'develop' of https://github.com/klaseskilson/vattentornet into develop
Add favicon
Style tweaks to drinks list
Config html compression
Fix #13, make sure @latest_news is present
Add link to new drink type, close #14
Update readme
Fixed new booking issue
Merge branch 'develop' of github.com:klaseskilson/vattentornet into develop
Redirect news correctly after creation, fix #18
Hotfix for crashing drinks view, close #20
Added validation to booking form
Merge branch 'master' into develop
Merged in develop