fix html problems
404 error castomization
Added status
Added status-line
Security fix
Communitie
Fix some problems, X3
mend
Fixes
Merge branch 'master' into feature/settings

Conflicts:
	src/BionicUniversity/Bundle/UserBundle/Resources/views/User/Front/about.html.twig
Merge branch 'feature/settings'
Merge branch 'master' into feature/status

Conflicts:
	app/Resources/views/front.html.twig
	src/BionicUniversity/Bundle/UserBundle/Form/UserSettingsType.php
	src/BionicUniversity/Bundle/UserBundle/Resources/config/doctrine/User.orm.yml
Merge branch 'feature/status'
Fix html
Mapping fix
Merge branch 'master' into feature/communitie

Conflicts:
	app/Resources/views/front.html.twig
	src/BionicUniversity/Bundle/WallBundle/Entity/Post.php
Merge branch 'feature/communitie'
Fix front file
fix some bugs
fix some bugs