Finished integration with Lilo
Started work on the News API
News API
Fixed a leftover (thanks @bgotink)
started new CalendarController API - Contains question.
found solution for Doctrine question
added path for CalendarController and raw skeleton CudiController
added path for CalendarController and raw skeleton CudiController
Basic cudi view should work
basic features should work
basic features should work
added week twig to cudi
added dummyCode for future key implementation
also added dummyCode for future key implementation - ShiftController
fixed minor error
minor error II
Merge branch 'refs/heads/master' into dev-api

Conflicts:
	module/CommonBundle/Component/Lilo/Connection/Http.php
	module/CommonBundle/Component/Lilo/Data/Exception.php
	module/CommonBundle/Controller/Admin/InstallController.php
	module/CommonBundle/Module.php
	module/NewsBundle/Controller/NewsController.php
	module/NewsBundle/Repository/Node/News.php
Merge branch 'dev-api' of github.com:LitusProject/Litus into dev-api
Merge branch 'refs/heads/master' into dev-api
Updated the calendar API