first commit
Merge branch 'master' of https://github.com/mylonasg88/symfony1_project

Conflicts:
	.idea/.name
	.idea/modules.xml
	.idea/workspace.xml
	app/AppKernel.php
	app/Resources/views/base.html.twig
	app/config/routing_dev.yml
	src/Acme/DemoBundle/Controller/WelcomeController.php
	web/app_dev.php