GPII-472: Created new NP sets with application specific settings
GPII-472: Renamed preferences sets to show they aren't the primary sets for the review
GPII-472: Renamed preferences sets to show they aren't the primary sets for the review
GPII-472: Updated values for androids audiomanager as there was an error in the reported value range.. Max is 15 so changed to that
GPII-383: Added preferences sets from claudia and andy, added missing device reporter entries
GPII-383: Merging with backup (application specific) preferences sets (GPII-472)Merge remote-tracking branch 'origin/GPII-472' into GPII-383
GPII-383: Merged the device reporter file into non-OS specific files. Moved the old example files to the example folder to avoid confusion in the future
GPII-383: Merged the device reporter file into non-OS specific files. Moved the old example files to the example folder to avoid confusion in the future -- forgot to add the merged files
GPII-383: Removed androidd stuff from demo 1 as it was decided we wont show that with context demo
GPII-383: Merge remote-tracking branch 'upstream/master' into GPII-383
GPII-383: Updated with latest sets from claudia
GPII-383: Removed entries for unimplemented solutions
Merge remote-tracking branch 'kaspermarkus/GPII-383' into review2

* kaspermarkus/GPII-383:
  GPII-383: Removed entries for unimplemented solutions
  GPII-383: Updated with latest sets from claudia
  GPII-383: Removed androidd stuff from demo 1 as it was decided we wont show that with context demo
  GPII-383: Merged the device reporter file into non-OS specific files. Moved the old example files to the example folder to avoid confusion in the future -- forgot to add the merged files
  GPII-383: Merged the device reporter file into non-OS specific files. Moved the old example files to the example folder to avoid confusion in the future
  GPII-383: Added preferences sets from claudia and andy, added missing device reporter entries
  GPII-472: Updated values for androids audiomanager as there was an error in the reported value range.. Max is 15 so changed to that
  GPII-472: Renamed preferences sets to show they aren't the primary sets for the review
  GPII-472: Renamed preferences sets to show they aren't the primary sets for the review
  GPII-472: Created new NP sets with application specific settings
Merge pull request #186 from michelled/review2

thank you michelle