Changed some things around so the app can pause and resume properly.
Made various changes including adding a new front page for the app and
fixing the camera activity.
Merge branch 'Matt'