Commit before merging to master from Android Studio branch.
Merge branch 'origin_master' into AndroidStudioVersion
Merging with Will's camera class.