Radial menu input
Prefabs
Merge branch 'master' of https://github.com/bah-interactivemedia/ReInventNASA2014

# By Michael Bray (7) and levilansing (1)
# Via Michael Bray (1) and levilansing (1)
* 'master' of https://github.com/bah-interactivemedia/ReInventNASA2014:
  Client: layout of random images
  Actually fixed filtering
  Fixed filtering
  Added category to Annotation model
  Implemented categories on annotations
  Added scraping of JSON from all three sources, only showing images that are 1024px wide, added mission field to DB, changed filter names
  API documentation
  Added Annotations table, added GET/POST calls for Annotations

Conflicts: