fixed bugs
Merge branch 'master' of https://github.com/mii5656/MobileConputing.git

Conflicts:
	ScrambledEgg/bin/ScrambledEgg.apk
	ScrambledEgg/bin/classes.dex
	ScrambledEgg/bin/classes/jp/ac/ritsumei/scrambledegg/MainActivity$MyBroadcastReceiver.class
	ScrambledEgg/bin/classes/jp/ac/ritsumei/scrambledegg/MainActivity$postJSONTask.class
	ScrambledEgg/bin/classes/jp/ac/ritsumei/scrambledegg/MainActivity.class
	ScrambledEgg/bin/resources.ap_
	ScrambledEgg/src/jp/ac/ritsumei/scrambledegg/MainActivity.java