ddd

ddd
test
Merge branch 'master' of https://github.com/geekcoding/geekedu

Conflicts:
	.DS_Store
	src/Site/.DS_Store
	src/Site/CommonBundle/Controller/DefaultController.php
	src/Site/CommonBundle/Resources/.DS_Store
	src/Site/CommonBundle/Resources/public/.DS_Store
	src/Site/CommonBundle/Resources/public/js/main.js
	src/Site/CommonBundle/Resources/public/libs/.DS_Store
	src/Site/CommonBundle/Resources/views/.DS_Store
	src/Site/CommonBundle/Resources/views/Default/index.html.twig
	src/Site/CommonBundle/Resources/views/Public/header.html.twig
	src/Site/CommonBundle/Resources/views/Public/navbar.html.twig
	src/Site/CommonBundle/Resources/views/Public/topnav.html.twig
	src/Site/CommonBundle/Resources/views/layout.html.twig
	src/Site/LessonBundle/Controller/DefaultController.php
	src/Site/LessonBundle/Resources/views/Default/index.html.twig
	src/Site/UserBundle/Resources/views/Registration/register.html.twig

src/Site/UserBundle/Resources/views/Registration/register_content.html.t
wig
	src/Site/UserBundle/Resources/views/Security/login.html.twig
	src/Site/UserBundle/Resources/views/Security/login_content.html.twig