test commit
Merge branch 'master' of https://github.com/jimenez-c/onzerocks

Conflicts:
	admin.php
	class/emission/Emission.class.php
	class/user/User.class.php
	index.php
	static/addEmission.html
	static/direct.html
	static/login.html
	ui/css/perso.css
	ui/fragments/gallery.html
	ui/pages/page.php