removed symlinks to bootstrap and added relative dirs in file inclusion
Merge branch '9_create_baselayout'
Merge branch 'master' of https://github.com/5sCloud/symfony

Conflicts:
	src/CsCloud/FrontendBundle/Resources/assets/less/bootstrap.less
	src/CsCloud/FrontendBundle/Resources/views/layout.html.twig
Redo commit for symlinks
bootstrap fix
bootstrap fix
Merge branch '13_profile_managment'

Conflicts:
	src/CsCloud/ApiBundle/Controller/ProfileController.php
	src/CsCloud/CoreBundle/Entity/UserProfile.php
	src/CsCloud/CoreBundle/Form/Type/UserProfileType.php
	src/CsCloud/FrontendBundle/Controller/ProfileController.php
	src/CsCloud/FrontendBundle/Resources/config/routing.yml
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/CsCloud/ApiBundle/Controller/ProfileController.php
just a rough fix for the avatar update. if the user is only updating that field the PreUpdate or PrePersist method were not triggered at all and i used a rand number to generate unique filename to make doctrine update that row.