Merge branch 'lab-5-uirouter' of https://github.com/objectpartners/angular-timesheet into lab-5-uirouter-solved

# By Bruce Coddington (2) and Michael Kelly (2)
# Via Michael Kelly (12) and Bruce Coddington (2)
* 'lab-5-uirouter' of https://github.com/objectpartners/angular-timesheet:
  Removing watch on deps.js
  Adding JSHint options to ignore mixed spaces and tabs.
  fixing indentation and adding jade task to development task
  Fixed index and added jade task to development task.
Added a jade task to compile index.html and add it to the client/assets directory.
Configured server.js to serve the compiled html instead of index.jade for root.
Removed the application controller. Locomotive is only used for the api endpoints.
Gruntfile cleanup to remove duplication.
Merge pull request #21 from objectpartners/nodemon-jade-fixes

Added a jade task to compile index.html and add it to the client/assets ...
This closes #3 by adding the configuration to avoid permission failures.
Merge branch 'lab-1-setup' into nodemon-jade-fixes

* lab-1-setup:
  This closes #3 by adding the configuration to avoid permission failures.
Merge pull request #22 from objectpartners/nodemon-jade-fixes

fixed .bowerrc for permissions
Merge branch 'lab-1-setup-solved' into lab-2-angular

* lab-1-setup-solved:
  This closes #3 by adding the configuration to avoid permission failures.
  Added a jade task to compile index.html and add it to the client/assets directory. Configured server.js to serve the compiled html instead of index.jade for root. Removed the application controller. Locomotive is only used for the api endpoints. Gruntfile cleanup to remove duplication.
Merge branch 'lab-2-angular' into lab-2-angular-solved

* lab-2-angular:
  This closes #3 by adding the configuration to avoid permission failures.
  Added a jade task to compile index.html and add it to the client/assets directory. Configured server.js to serve the compiled html instead of index.jade for root. Removed the application controller. Locomotive is only used for the api endpoints. Gruntfile cleanup to remove duplication.
Merge branch 'lab-2-angular-solved' into lab-3-karma

* lab-2-angular-solved:
  This closes #3 by adding the configuration to avoid permission failures.
  Added a jade task to compile index.html and add it to the client/assets directory. Configured server.js to serve the compiled html instead of index.jade for root. Removed the application controller. Locomotive is only used for the api endpoints. Gruntfile cleanup to remove duplication.

Conflicts:
	Gruntfile.js
Merge branch 'lab-3-karma' into lab-3-karma-solved

* lab-3-karma:
  This closes #3 by adding the configuration to avoid permission failures.
  Added a jade task to compile index.html and add it to the client/assets directory. Configured server.js to serve the compiled html instead of index.jade for root. Removed the application controller. Locomotive is only used for the api endpoints. Gruntfile cleanup to remove duplication.
Merge branch 'lab-3-karma-solved' into lab-4-modules

* lab-3-karma-solved:
  This closes #3 by adding the configuration to avoid permission failures.
  Added a jade task to compile index.html and add it to the client/assets directory. Configured server.js to serve the compiled html instead of index.jade for root. Removed the application controller. Locomotive is only used for the api endpoints. Gruntfile cleanup to remove duplication.
Merge branch 'lab-4-modules' into lab-4-modules-solved

* lab-4-modules:
  This closes #3 by adding the configuration to avoid permission failures.
  Added a jade task to compile index.html and add it to the client/assets directory. Configured server.js to serve the compiled html instead of index.jade for root. Removed the application controller. Locomotive is only used for the api endpoints. Gruntfile cleanup to remove duplication.
Merge branch 'lab-4-modules-solved' into lab-5-uirouter

* lab-4-modules-solved:
  This closes #3 by adding the configuration to avoid permission failures.
  Added a jade task to compile index.html and add it to the client/assets directory. Configured server.js to serve the compiled html instead of index.jade for root. Removed the application controller. Locomotive is only used for the api endpoints. Gruntfile cleanup to remove duplication.
Merge branch 'lab-5-uirouter' into lab-5-uirouter-solved

* lab-5-uirouter:
  This closes #3 by adding the configuration to avoid permission failures.
  Added a jade task to compile index.html and add it to the client/assets directory. Configured server.js to serve the compiled html instead of index.jade for root. Removed the application controller. Locomotive is only used for the api endpoints. Gruntfile cleanup to remove duplication.
Merge branch 'lab-5-uirouter-solved' of https://github.com/objectpartners/angular-timesheet into lab-5-uirouter-solved

# Via Michael Kelly
* 'lab-5-uirouter-solved' of https://github.com/objectpartners/angular-timesheet: