latest changes
Merge branch 'master' of https://github.com/mhowansky/scow

Conflicts:
	cow-server-api/pom.xml