Merge pull request #3 from tangaratest/master

Gitignore's François commits
Merge pull request #1 from tangaratest/master

François integration commits
Merge pull request #2 from tangaratest/master

Merge all commits from Francois about Project checked
upload action completed to be link in project page
Merge branch 'master' of https://github.com/Neonunux/tangara-ui

Conflicts:
	src/Tangara/UserBundle/Controller/ProfileController.php
TangaraUserBundle: variable in fr corrected
Merge origin/master
Formating confirmation page on group join demand
first connexion with TangaraJS: fileAction
Merge neonunux/master

Conflicts:
	src/Tangara/ProjectBundle/Resources/config/routing.yml
Delete .DS_Store
Merge pull request #3 from colombbus/master

Upload form updates
Merge neonunux/master

Conflicts:
	src/Tangara/ProjectBundle/Resources/config/routing.yml
Merge neonunux/master
ProjectBundle: Variables renamed
ProjectBundle: Variables renamed
ProjectBundle: Bug on project Repository and view selector view resolved
Merge pull request #4 from colombbus/master

Merge from colombbus rep
ProjectBundle: contributor included and userGroup removed
Merge neonunux/master