Minor name changes and locked camera to portrait
Merge branch 'camera' into new_master