community logo
Merge branch 'master' into feature/community_subscribers

Conflicts:
	app/Resources/views/_helpers.html.twig
	app/Resources/views/base.html.twig
	app/Resources/views/front.html.twig
	bower.json
	src/BionicUniversity/Bundle/CommunityBundle/Controller/Front/CommunityController.php
	src/BionicUniversity/Bundle/CommunityBundle/Resources/config/doctrine/Community.orm.yml
	src/BionicUniversity/Bundle/CommunityBundle/Resources/config/services.yml
	src/BionicUniversity/Bundle/CommunityBundle/Resources/views/Community/Front/community.html.twig
	src/BionicUniversity/Bundle/MessageBundle/Resources/views/Message/Front/messages.html.twig
	src/BionicUniversity/Bundle/UserBundle/Controller/Front/UserController.php
	src/BionicUniversity/Bundle/UserBundle/Entity/User.php
	src/BionicUniversity/Bundle/UserBundle/Resources/config/services.yml
	src/BionicUniversity/Bundle/UserBundle/Resources/views/User/Front/profile.html.twig
	src/BionicUniversity/Bundle/UserBundle/Twig/RoutingExtension.php
	web/assets/page.css
Merge branch 'feature/community_subscribers'