Merge branch 'master' into notifications
[desing] New navbar design
Merge branch 'master' into design
Merge branch 'notifications' of git://github.com/titouanc/beta402 into notifications
[fix] buggy merge and [enh] navbar : real <a> for links
Merge branch 'master' into notifications
Merge branch 'master' into design
[rem] features that uses some code from the notifications branch
Fix merge conflicts
[fix] navbar links and toggle
Fix merge conflicts