Fixed index and added jade task to development task.
Merge branch 'lab-3-karma' into lab-3-karma-solved

* lab-3-karma:
  Fixed index and added jade task to development task.
fixing indentation and adding jade task to development task
Merge branch 'lab-4-modules' into lab-4-modules-solved

* lab-4-modules:
  fixing indentation and adding jade task to development task
Adding JSHint options to ignore mixed spaces and tabs.
Merge branch 'lab-1-setup-solved' into lab-2-angular
Merge branch 'lab-2-angular' into lab-2-angular-solved
Merge branch 'lab-2-angular-solved' into lab-3-karma
Merge branch 'lab-3-karma' into lab-3-karma-solved
Merge branch 'lab-3-karma-solved' into lab-4-modules

Conflicts:
	api/app/views/application/index.jade
Merge branch 'lab-4-modules' into lab-4-modules-solved
Merge branch 'lab-4-modules-solved' into lab-5-uirouter

Conflicts:
	api/app/views/application/index.jade