record buttons disappear for mobile, message about recording appears instead
fixing merge conflict for stylesheets - kept everything
Merge branch 'master' into mobile_choose_recording
latest master
Merge pull request #61 from red-admirals-2014/mobile_choose_recording

Mobile choose recording
Merging JSON's branch in with earlier stuff from today.

Merge branch 'master' of https://github.com/red-admirals-2014/Stage-Fright
fixing merge conflicts with master branch