Merge origin/master

Conflicts:
	application/config/routes.php
Merge origin/master