Revert "Fixed bugs, and implemented Add/Remove from favorites as well as History View Controller."

This reverts commit a1f36e1ff10366708e0ad443825a2175ce13186d.
Attempting to commmit working changes from Tuesday afternoon
Merge branch 'develop' of https://github.com/denimgroup/Pandemobium into develop

Conflicts:
	PandemobiumStockTrader/iOS/Pandemobium.xcodeproj/project.pbxproj
	PandemobiumStockTrader/iOS/PandemobiumV2/MainStoryboard.storyboard
	Server/.idea/workspace.xml