Update map view
Add missing files
Fix login
Merge branch 'jl'

Conflicts:
	client/app/scripts/routes/app_router.js