ga ngutak-ngatik yang ini padahal.. tai disuruh commit. semoga ga ngerusak project.
Merge branch 'master' of https://github.com/okihita/smicep

Conflicts:
	bin/AndroidManifest.xml
	bin/Neo-SMICEP.apk
	bin/classes.dex
	bin/classes/.gitignore
	bin/dexedLibs/android-support-v4-4b3fbfe14e137095b87586d79226d9b8.jar
	bin/dexedLibs/android-support-v4-ce5bb46bf5ba2e241a9047f0d13f3940.jar
	bin/resources.ap_
	gen/.gitignore
	src/com/okihita/neo_smicep/Home.java