sync
Merge branch 'master' of https://github.com/imyelo/nga-webapp

Conflicts:
	js/main.js