Chuan/Kevin/Chris - added Questions Cache Manager
		  - fixed connectivity checker
connectivity
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk

Conflicts:
	OctoAskT12/bin/OctoAskT12.apk
	OctoAskT12/bin/R.txt
	OctoAskT12/bin/classes.dex
	OctoAskT12/bin/resources.ap_
	OctoAskT12/gen/cs/ualberta/octoaskt12/R.java
	OctoAskT12/src/cs/ualberta/octoaskt12/geol/version.java
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
	OctoAskT12TestsTest/bin/OctoAskT12Tests.apk
	OctoAskT12TestsTest/bin/classes.dex
added caching when there's no internet connection
Merge pull request #79 from aktse/master

fixed properties
merge problem
merge problems
problems with merging and connectivity
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