removed login/logout navigation bug
Merge branch 'master' of https://github.com/thebuoyant/AMD-GEO-TOOLS

Conflicts:
	www/js/app/views/dialog/login-view.js
fixed tests for slick grid use
(cherry picked from commit 907042d97ea274f7f19d60ca9c24a232a9cb982b)