modif emplacement fichier css
Modif form Client et Project
Edit of the enabled users view
Merge branch 'dev' of github.com:dnr2i-2014/uniweb into dev
debut front css
Merge branch 'dev' of github.com:dnr2i-2014/uniweb into dev
change css admin
Merge branch 'dev' of github.com:dnr2i-2014/uniweb into dev
Design view projet
Gestion conflit design
Modif form client
Merge branch 'dev' of https://github.com/dnr2i-2014/uniweb into dev
modif admin
Merge branch 'feature' into dev
modif path css
Merge branch 'design' into dev
modif path css
correctif asset
design view project
Merge branch 'feature' into dev