commit to merge
Merge branch 'master' of https://github.com/Lacroute/rebus

Conflicts:
	app/Controllers/ConnectorController.php
	app/Views/home.php
	config/routes.ini
merging