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

Conflicts:
	Makefile