Merge topbar.php
Merge branch 'master' of http://github.com/Robpayot/Projet-3-API