friend functionality
rest functionality
Merge pull request #125 from ritesharora89/friends-page

friend functionality
friend page
Merge pull request #126 from ritesharora89/friendpage

friend page
course publishing
small change
Merge pull request #127 from ritesharora89/mybranch

course publishing
subscription
Merge pull request #129 from ritesharora89/mybranch

subscription
linking and implement the style
Merge pull request #130 from ritesharora89/mybranch

linking and implement the style
add friend
Merge pull request #131 from ritesharora89/add-friend

add friend
add/remove instrucgtors
Merge pull request #132 from ritesharora89/mybranch

add/remove instrucgtors
compiled js
Merge pull request #133 from ritesharora89/mybranch

compiled js
Merging

Merge remote-tracking branch 'origin/master' into 9-march

Conflicts:
	src/Seeder/FrontendBundle/Controller/CourseManagerController.php
	src/Seeder/FrontendBundle/Controller/LessonPageController.php
	src/Seeder/FrontendBundle/Controller/SubscriptionController.php
	src/Seeder/FrontendBundle/Resources/config/doctrine/UserCredits.orm.yml
	src/Seeder/FrontendBundle/Resources/config/routing.yml
	src/Seeder/FrontendBundle/Resources/views/CourseManager/viewCourse.html.twig
	src/Seeder/FrontendBundle/Resources/views/CreditAccount/index.html.twig
removed conflicts