Merge branch 'master' of https://github.com/robs1020/PG-Build-App

Conflicts:
	js/HomeView.js
remove that scope
Merge branch 'master' of https://github.com/robs1020/PG-Build-App