Fixed the favorites saving that someone broke
Fixing merge conflicts
Fixed save favorites and merge conflicts
Merge pull request #211 from iameric1986/master

Fixed the favorites saving that someone broke
stuff
Merge pull request #212 from rjynn/newBranch

merged my changes with erics
Fixed user posted save function
Merge pull request #213 from iameric1986/master

Fixed user posted save function
UI TESTS
Merge pull request #214 from pachalad/master

UI TESTS
UI TESTS
Merge pull request #215 from pachalad/master

UI TESTS
Fixed errors
Merge pull request #216 from pachalad/master

Fixed errors
Fixed view posted questions
Merge pull request #217 from iameric1986/master

Fixed view posted questions
Viewquestion tests for answer mode
added test to see if new activity opening in mainactivity UI
Merge remote-tracking branch 'upstream/master' into newBranch
Merge pull request #219 from rjynn/newBranch

tested for new activity pop up in main UI