Added apache license headers to remaining files
Merge branch 'master' of github.com:rodsimpson/incubator-usergrid
Merge branch 'pr/36'
cleanup of admin portal

convert to Usergrid branding
remove highcharts
remove other Apigee artifacts
more updates to look and feel
updates for USERGRID-205

Changed default queue read timeout to 5 seconds.  30 seconds is too long and results in occasional runtime hiccups.
adding rx to master
merge pull request 36

* apache/add-metrics:
  adding rx to master
  updates for USERGRID-205
  Implements USERGRID-205
  Implements USERGRID-205
  Upgrade JobFactory to only return 1 job, not many for a descriptor since we're not using it in this way.
  adding an iterator interface to look for extra pages
  Fixes tests to be clearer
updated bower version, fixed app overview, modified help
moved generated files to their own directories
Merge branch 'pr/35'
trying to fix file status bug
fixed status changed error
 merging from remote master