ytr
Merge branch 'master' of https://github.com/deewanstudios/Localisation

Conflicts:
	application/controllers/name_controller.php
	application/data/name.php