hf settings
Merge branch 'master' of https://github.com/keertijoshi/peaxy-app

Conflicts:
	src/app/installation/install-service.js
Merge branch 'master' of https://github.com/keertijoshi/peaxy-app