Merge branch 'devel'
Merge branch 'devel'
Merge branch 'devel' for sprint3 finish.
Updated README on Master

I updated the README on Master to remove the random Backbone Wiki link.  That will come when we merge sprint4 into master with it's massive README update.
OCD.

The H2 creates a line underneath, no need for another.
Merge branch 'devel' + sprint4
Merge branch 'devel' (sprint5)
Fix merge of git submodules

Need to add requirejs back in
Local.js needs to specific all adapter settings

This is a bug in sails; it should merge the adapter settings
from config/adapters.js with those in config/local.js.
Unfortunately it doesn't do that.  For now, put all the
settings in local.js so that we're sure they're used.
Reset requirejs to the `latest` branch

Not sure if this is causing problems, but just to
be sure, only use the `latest` release of requirejs.
Added jQuery to Project List Controller.
Hotfix merge for problems deploying
Add missing jquery define/require

Need to include jquery for all views/controllers that use it.
Added jQuery to All Files.

- I also removed 'use strict' from all non-entity files.
jquery require needs a $ target
Added require error catching.
Removed random + sign from Bootstrap.
Merge branch 'master' of https://github.com/Innovation-Toolkit/midas

* 'master' of https://github.com/Innovation-Toolkit/midas:
  jquery require needs a $ target
Reverting + change so bootstrap loads.
Reverted Bootstrap and added wait seconds to Reqjs