PAyment Plan Creation
Admin controls
Admin panel
Admin panel with editor
Admin panel adding contents to lesson
jnjkn
twig
update expiry and subscription
dscs
db entity
asdasd
asdasd
aaaaa
fdfxc
Merge remote-tracking branch 'origin/anuj_18feb' into master_temp

Conflicts:
	src/Queskey/FrontEndBundle/Entity/Course.php
	src/Queskey/FrontEndBundle/Entity/User.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
asdasfasfasfasf
dfghjk
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