initial from local|
Merge branch 'master' of https://github.com/Urbanway/GlocedApp

Conflicts:
	LICENSE
	README.md