Clean up
Merge branch 'master' of https://github.com/3musket33rs/aerogear-mobile-scaffolding