Tyler-1.0.3-TempData | Modified services to return a deffered object s we are not reliant on controllers.
Added entry
Delete all idea files
deleted .idea files
Merge branch 'develop' of https://github.com/thortek/dgm4790-spring2014 into develop
Merge branch 'develop' into tyler-2.7-auth

* develop:
  Delete all idea files
  Created logos for dean's radar
  added ng-class grey

Conflicts:
	www/js/controllers.js
	www/templates/dean-home.html
Merge pull request #6 from thortek/tyler-2.7-auth

Updated Controllers to read from services, services pass in deferred object.
fixed merge problems from class
fixed grey class
Added icons for different departments.
Updated .gitignore to now try and upload /myApp/ folder
Merge pull request #8 from thortek/joe-1.0.2-icons

Added icons for different departments.
Added to .gitignore
Merge branch 'develop' of github.com:thortek/dgm4790-spring2014 into develop

# By TylersDesk (1) and others
# Via TylersDesk (1) and joehafen (1)
* 'develop' of github.com:thortek/dgm4790-spring2014:
  Updated .gitignore to now try and upload /myApp/ folder
  Added icons for different departments.
  fixed grey class
Stop tracking these files
stop tracking
Merge branch 'develop' of github.com:thortek/dgm4790-spring2014 into develop

# By John Perl
# Via John Perl
* 'develop' of github.com:thortek/dgm4790-spring2014:
  stop tracking
Forced default URL to be the dean page
Merge pull request #7 from thortek/develop

Develop
Merge pull request #9 from thortek/Tyler-2.7-Default-State

Forced default URL to be the dean page