Merge pull request #363 from cchan5/master

Can now attach image from gallery
Merge pull request #364 from cchan5/master

Made a PictureController and cleaned up a little bit of code
Fixed the loading logic so that only 10 questions load at a time
Merge pull request #365 from iameric1986/master

Fixed the loading logic so that only 10 questions load at a time
Pushed fixes from last commit; accidentally checkout-ed master which erased the fixes
Merge pull request #366 from iameric1986/master

Pushed fixes from last commit; accidentally checkout-ed master which era...
Fixed test cases, main activity now kills sync if sync is still syncing
Merge pull request #367 from pachalad/master

Fixed test cases, main activity now kills sync if sync is still syncing and mainactivity is no more
Fixed more tests
Merge pull request #368 from pachalad/master

Fixed more tests
whole shit load of new icons
Merge pull request #369 from jivedesign/master

whole shit load of new icons
Refactored a lot of stuff.
Merge pull request #370 from iameric1986/master

Refactored a lot of stuff.
Solving merge conflict
Merge remote-tracking branch 'upstream/master'

Conflicts:
	cmput301t03appTEST-test/src/ViewQuestionUITest.java
Merge pull request #371 from pachalad/master

Tests and stuff
Slight changes to upvoting
Merge pull request #372 from iameric1986/master

Slight changes to upvoting
Carly fixed the camera