Merge fix
Merge branch 'master' of github.com:lpachols/appmaker