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