First commit
Merge branch 'master' of https://github.com/gisweb/GisClient-2

Conflicts:
	README.md