Merge remote-tracking branch 'origin/anuj_16feb'
Merge branch 'refs/heads/anuj_18feb'
courses
update
subscription half done
update on subscription
jnjkn
twig
update expiry and subscription
asdasd
asdasd
aaaaa
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