maj nico
Merge branch 'master' of https://github.com/flousse/homazing

Conflicts:
	app/Controllers/Facebook_controller.php
	app/Controllers/Twitter_controller.php
Maj nico
Merge branch 'master' of https://github.com/flousse/homazing