First pass at video size debug settings
Merge branch 'video-size-settings'
Quick hack to get redpark working agian

- comment out bluetooth object so correct
  redpark codepath is called

- wrap DebugLogging:console code in ifndef define
  so that when we build for release redpark debug
  data is no longer printed on map view.
Merge branch 'redpark-fix'
Make the done button on kxmovie work

- Make the done button on the kxmovie
  vc work by listenting for a newly
  added notification so that we don't
  have to make major changes to kxmovie
  right now.
Merge branch 'video-done-button-fix'
Merge branch 'master' into follow-me

Conflicts resolved in:
	iGCS/UserInterface/MainStoryboard.storyboard
	iGCS/UserInterface/ViewControllers/GCSMapViewController.m