/ | adds FOSRoutingJsBundle & ADesignCalendar
adding new blank lines at the end of files
Merge branch 'master' into fullcalendar
AssetsBundle/REsource/index.html.twig | fixes col issues
Merge branch 'master' into fullcalendar

Conflicts:
	app/AppKernel.php
Update config.php
Merge pull request #38 from PicoPlan/fullcalendar

Fullcalendar