#150 added the correct redirectTo config for otherwise in httpRouter
#153 fixed the grunt build to use angular-route and remove ui-router
Merge branch 'lab-2-angular' into lab-2-angular-solved

* lab-2-angular:
  #150 added the correct redirectTo config for otherwise in httpRouter
Merge branch 'lab-2-angular-solved' into lab-3-karma

* lab-2-angular-solved:
  #150 added the correct redirectTo config for otherwise in httpRouter
Merge branch 'lab-3-karma' into lab-3-karma-solved

* lab-3-karma:
  #150 added the correct redirectTo config for otherwise in httpRouter
Merge branch 'lab-4-modules' into lab-4-modules-solved

* lab-4-modules:
  #153 fixed the grunt build to use angular-route and remove ui-router
updating git ignore
switching to Express 4
cherry pick - upgraded ui router throwing errors
getting correct parameters from request
cherry pick - routes working but passport not
cherry pick - logout works
cherry pick - back to normal
cherry pick - fixing fonts, etc.
cherry pick : components in separate modules
added comment and description
Merge branch 'lab-1-setup-solved' into lab-2-angular

* lab-1-setup-solved:
  added comment and description
  cherry pick : components in separate modules
  cherry pick - fixing fonts, etc.
  cherry pick - back to normal
  cherry pick - logout works
  cherry pick - routes working but passport not
  getting correct parameters from request
  cherry pick - upgraded ui router throwing errors
  switching to Express 4
  updating git ignore

Conflicts:
	Gruntfile.js
	api/server.js
	api/src/views/index.jade
	client/assets/html/index.html
	client/src/main.js
Merge branch 'lab-2-angular' into lab-2-angular-solved

* lab-2-angular:
  added comment and description
  cherry pick : components in separate modules
  cherry pick - fixing fonts, etc.
  cherry pick - back to normal
  cherry pick - logout works
  cherry pick - routes working but passport not
  getting correct parameters from request
  cherry pick - upgraded ui router throwing errors
  switching to Express 4
  updating git ignore

Conflicts:
	client/assets/html/index.html
Merge branch 'lab-2-angular-solved' into lab-3-karma

* lab-2-angular-solved:
  added comment and description
  cherry pick : components in separate modules
  cherry pick - fixing fonts, etc.
  cherry pick - back to normal
  cherry pick - logout works
  cherry pick - routes working but passport not
  getting correct parameters from request
  cherry pick - upgraded ui router throwing errors
  switching to Express 4
  updating git ignore

Conflicts:
	Gruntfile.js
	api/src/views/index.jade
Merge branch 'lab-3-karma' into lab-3-karma-solved

* lab-3-karma:
  added comment and description
  cherry pick : components in separate modules
  cherry pick - fixing fonts, etc.
  cherry pick - back to normal
  cherry pick - logout works
  cherry pick - routes working but passport not
  getting correct parameters from request
  cherry pick - upgraded ui router throwing errors
  switching to Express 4
  updating git ignore

Conflicts:
	client/assets/html/index.html