Fix some autowiring.. bypass google cal integration
Fix autowiring
Merge branch 'master' of https://github.com/kellyfj/BestDayEver

Conflicts:
	bestdayever-app/src/main/java/com/nokia/scbe/bestdayever/controller/BestDayEverController.java