Merge pull request #1012 from bdonald25/bd859

Canobie app now has action bar to switch between live and dev, media manager allows for user to take pictures and upload them to a project, and configuration errors now disappear as the user fixes them
git fethMerge remote-tracking branch 'upstream/master' into bd859
progress