Added descriptions to karma file conf

Conflicts:
	test/karma.conf.js
Fetch templates with $http, run init() after

getTemplate() now return a promise. It is immediately resolved if the
template is local. If it is remote, the promise is resolved after the
template is fetched and put into the cache.  Also the $http request is
cached in $templateCache as well, so the same template should only be
fetched once no matter now many grids use it.

New function self.initTemplates(), calls getTemplate() for each of the template
types. Returns a promise via $q.all() that bundles all the getTemplate()
promises.

self.init() now returns a promise and defers execution until after
initTemplates() completes.
Wait for grid.init() to complete, then continue

grid.init() is now called here, not in src/classes/grid.js. It returns a
promise which delays the execution until everything is ready (templates,
and whatever else init() does).
Adding express webserver for testing templates

A bug with external templating occurs when the template comes back AFTER
the data is ready to be drawn in the grid.  This script uses express to
delay serving the grid template for a couple hundred milliseconds.
Adding express to devDependencies
Adding files for testing external templates

There is a bug with external templating where if the template comes back
AFTER asynchronously loaded data is ready, an "$apply/$digest is already
executing" error will occur. This test will demonstrate that in tag 2.0.4
if you access it via scripts/server.js

Conflicts:
	workbench/templating/external.html
Removing commented out old code
Merge branch 'master' into fix-external-templates-premerge
Removing express from devDependencies
Adding v2.0.5 change log notes
Trying to get sortActual failing test working
Failing test for sortActual working?
Fixes #348, patch supplied by sum4me

sortActual() was using a non-existent variable for accessing the row in
rowCache while iterating over the data.
Merge branch 'fix-new-row-selection' into release-2.0.5
Turn off iit() of sortActual test
Including notes on sortActual() fix
2.0.5
Fixing dates, 2.0.4 messge
Updating to 2.0.5
Merge pull request #358 from angular-ui/release-2.0.5

Release version 2.0.5. Changes are in README.md