latest upgrade
Merge branch 'master' of https://github.com/BloodMoonShard/test

Conflicts:
	application/config/routes.php