Initial commit.
Merge branch 'master' of github.com:zhibek/crowdmap-client

Conflicts:
	composer.json