rendMesBarathons
Merge branch 'master' of https://github.com/Rapou/OGO_projetBarathon

Conflicts:
	application/Controller/Parties.php
	application/Model/ListeBars.php
	www/js/controllers.js
	www/js/services.js

ss