Merge branch 'master' of github.com:webistor/webistor-app