add SATW subscription
Merge branch 'master' into jetty7
Merge branch 'jetty7' into heroku

Conflicts:
	src/main/resources/init-data.sql