updates
updates
Merge branch 'master' of github.com:iPlanGroup/iPlan

Conflicts:
	.classpath
	bin/classes.dex
	bin/classes/com/bbk/UI/GridViewAdapter.class
	bin/dexedLibs/android-support-v4-9d53c81c0a831a847fc48281e693ca5a.jar
	bin/dexedLibs/annotations-9009f755869825ca7138e60a290be836.jar
	bin/iPlan.apk
	bin/resources.ap_
	src/com/bbk/UI/GridViewAdapter.java
updates