change tomcat user-password
Merge branch 'master' of github.com:7bits/natural-exchange