fix is loading if error
fixing search results loading
Merge remote-tracking branch 'upstream/master' into is-loading
fixing karma
merging
results is loading
merged
merging
merging properly
fix results
fixing activity controller
activity type
adding tests
fixing comments
Merge pull request #1016 from tarunc/test-caching

Getting rid of test options in grunt-- do it in karma
added constant
Merge pull request #910 from tarunc/is-loading

Fix isLoading if errors
Merge remote-tracking branch 'upstream/master'