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

Conflicts:
	src/app/app.js

src/app/installation/hyperfiler-settings/hyperfilersettings-controller.j
s
	src/app/installation/install.scss