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
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