just another update
Merge branch 'master' of https://github.com/deewanstudios/Localisation

Conflicts:
	.project (1)
	tester.html