settings update - approach to localstorage
Merge branch 'master' of https://github.com/dyluniodev/akg-app

Conflicts:
	settings.html