versioning
Merge branch 'master' of github.com:jpcik/morph-web

Conflicts:
	sparqlstream-web/conf/application.conf
Merge branch 'master' of github.com:jpcik/morph-web