small changes.
make some changes to some test cases to get some more to work - turned off network connection for most of them - testing actions without pushing to the network
Merge branch 'master' of https://github.com/CMPUT-301F14T10/project

Conflicts:
	QueueUnderflow/bin/QueueUnderflow.apk
	QueueUnderflow/bin/classes.dex
	QueueUnderflow/src/ca/ualberta/cs/queueunderflow/NetworkManager.java
fix merge conflicts