update makefile
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
update makefile
update makefile
fixed init of wps, csw and mongodb
Merge branch 'master' into develop

Conflicts:
	Makefile
updated readme
Merge branch 'master' into develop
release 0.2.2
update todo