add missing files

Conflicts:
	.gitignore
	app/Resources/views/base.html.twig
	app/config/routing.yml
	app/config/routing_dev.yml
	src/Exams/AdminBundle/Controller/AnswerController.php
	src/Exams/AdminBundle/Controller/DefaultController.php
	src/Exams/AdminBundle/Controller/ExaminationController.php
	src/Exams/AdminBundle/Controller/QuestionController.php
	src/Exams/AdminBundle/Controller/SubjectController.php
	src/Exams/AdminBundle/Controller/UserAnswerDetailController.php
	src/Exams/AdminBundle/Controller/UserController.php
	src/Exams/AdminBundle/Entity/Examination.php
	src/Exams/AdminBundle/Entity/Question.php
	src/Exams/AdminBundle/Entity/User.php
	src/Exams/AdminBundle/Form/QuestionType.php
	src/Exams/AdminBundle/Resources/public/bootstrap/css/bootstrap.css
	src/Exams/AdminBundle/Resources/views/Default/index.html.twig
	src/Exams/AdminBundle/Resources/views/Subject/edit.html.twig
	src/Exams/AdminBundle/Resources/views/Subject/index.html.twig
	src/Exams/AdminBundle/Resources/views/Subject/new.html.twig
	src/Exams/AdminBundle/Resources/views/Subject/show.html.twig
	src/Exams/AdminBundle/Resources/views/User/edit.html.twig
	src/Exams/AdminBundle/Resources/views/User/index.html.twig
	src/Exams/AdminBundle/Resources/views/User/new.html.twig
	src/Exams/AdminBundle/Resources/views/User/show.html.twig
	src/Exams/ExaminationBundle/Controller/DefaultController.php
	src/Exams/ExaminationBundle/Resources/views/Default/index.html.twig