Bugfix #31 and #38
Merge branch 'master' of https://github.com/appsgate2015/appsgate

Conflicts:
	sources/appsgate-client/app/modules/mediator.js