b
Merge branch 'master' of https://github.com/fteamit/decode

Conflicts:
	application/modules/default/controllers/IndexController.php
	library/FTeam/Controller/Action.php