20140824_2
Merge branch 'master' of https://github.com/haniemF5/haniem_F5.git

Conflicts:
	OurBlackBox5/bin/OurBlackBox5.apk
	OurBlackBox5/bin/classes.dex
	OurBlackBox5/bin/classes/com/example/ourblackbox2/SettingActivity.class
	OurBlackBox5/bin/dexedLibs/appcompat_v7-b4323fc3a85f5bf474fbe8e8b9e7fe59.jar
	OurBlackBox5/bin/resources.ap_
	OurBlackBox5/src/com/example/ourblackbox2/SettingActivity.java
20140824_2