Finish move to loading icons (including wrapping $resource calls into promises)
Merge branch 'master' into ui-improv-14-01-31_p2

Merging local changes with the master.
Merge pull request #338 from karma-exchange-org/ui-improv-14-01-31_p2

Finish move to loading icons (including wrapping $resource calls into promises)