Twitter connect
Merge branch 'master' of https://github.com/flousse/The-whole
Merge branch 'master' of https://github.com/flousse/The-whole
Merge branch 'master' of https://github.com/flousse/The-whole

Conflicts:
	app/Controllers/Twitter_controller.php
delete twitter