Merge pull request #80 from 0nebit/master

merge problems and connectivity
Changed the layout
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk

Conflicts:
	OctoAskT12/bin/OctoAskT12.apk
	OctoAskT12/bin/classes.dex
	OctoAskT12/bin/resources.ap_
	OctoAskT12/src/cs/ualberta/octoaskt12/geol/version.java
	google-play-services_lib/project.properties
Merge pull request #81 from creativlimade/master

Fixed the layout.
implemented history and more backstack stuff
stuff
Merge pull request #82 from aktse/master

implemented history and more backstack
fixed up history fragment to display order viewed instead of sort
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk
Merge pull request #83 from aktse/master

fixed up history fragment
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk

Conflicts:
	OctoAskT12/bin/OctoAskT12.apk
	OctoAskT12/bin/classes.dex
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk