Merge pull request #15 from lyg830/master

Camera Update
The app looks much better now.

Updates to the layout of the main activity, main fragment, settings
fragment, upload fragment, and detail photo layout. The spinner n the
settings fragment now works. The buttons in the settings don't have ugly
grey backgrounds anymore.
Merge pull request #16 from rmcshane5/master

The app looks much better now.
Merged Eduardos changes
Merge remote-tracking branch 'upstream/master'