Merge branch 'master' into channels
Merge branch 'master' of github.com:irestful/OspinionDotCom into channels
Update upload
Navigation et harmonisation navbar sur toute les pages
Navigation et harmonisation navbar sur toutes les pages
Merge branch 'channels' of https://github.com/irestful/OspinionDotCom
Harmonisation page d'upload