UI fixes, Wall fixes, url fixes.
Merge remote-tracking branch 'origin/master'

Conflicts:
	ExpressApp2/app/public/js/controllers/indexController.js
	ExpressApp2/app/server/router.js
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 8ddc05639789d31143279392cbabf83b2028d8ec.