XY
Merge branch 'master' of https://github.com/scholster/QueskeyDev

Conflicts:
	src/Queskey/FrontEndBundle/Entity/Course.php
	src/Queskey/FrontEndBundle/Resources/config/routing.yml
asdasda
asdasd
ass
dddd
Merge remote-tracking branch 'origin/akshat'

Conflicts:
	src/Queskey/FrontEndBundle/Controller/AdminController.php
	src/Queskey/FrontEndBundle/Resources/config/doctrine/Course.orm.xml
	src/Queskey/FrontEndBundle/Resources/config/doctrine/PaymentPlans.orm.xml
	src/Queskey/FrontEndBundle/Resources/config/doctrine/SubCategory.orm.xml
	src/Queskey/FrontEndBundle/Resources/config/doctrine/User.orm.xml
	src/Queskey/FrontEndBundle/Resources/config/routing.yml
	src/Queskey/FrontEndBundle/Resources/views/Admin/admin_topics.html.twig
	web/js/admin_topics.js
dsfdfdgdfghghfgh