Merge branch 'master' of https://github.com/Socktan/Manhattan.git

Conflicts:
	DexWebStack/dexknows/templates/pages/businessProfile/app.js
Merge branch 'master' of https://github.com/Socktan/Manhattan.git