commit
commit
Merge branch 'master' of https://github.com/AkashKale/B2Mobile

Conflicts:
	BBartersMobile/bin/BBartersMobile.apk
	BBartersMobile/bin/R.txt
	BBartersMobile/bin/classes.dex
	BBartersMobile/bin/classes/android/support/v7/appcompat/R$attr.class
	BBartersMobile/bin/classes/android/support/v7/appcompat/R$styleable.class
	BBartersMobile/bin/classes/com/bbarters/bbartersmobile/ActionFragment.class
	BBartersMobile/bin/classes/com/bbarters/bbartersmobile/Home.class
	BBartersMobile/bin/classes/com/bbarters/bbartersmobile/IFCManager$1.class
	BBartersMobile/bin/classes/com/bbarters/bbartersmobile/IFCManager.class
	BBartersMobile/bin/classes/com/bbarters/bbartersmobile/Login$2$1.class
	BBartersMobile/bin/classes/com/bbarters/bbartersmobile/Login$2.class
	BBartersMobile/bin/classes/com/bbarters/bbartersmobile/Login.class
	BBartersMobile/bin/classes/com/bbarters/bbartersmobile/NotificationAdapter.class
	BBartersMobile/bin/classes/com/bbarters/bbartersmobile/NotificationFragment.class
	BBartersMobile/bin/classes/com/bbarters/bbartersmobile/PreviewPage.class
	BBartersMobile/bin/classes/com/bbarters/bbartersmobile/ProfilePage.class
	BBartersMobile/bin/classes/com/bbarters/bbartersmobile/R$attr.class
	BBartersMobile/bin/classes/com/bbarters/bbartersmobile/R$color.class
	BBartersMobile/bin/classes/com/bbarters/bbartersmobile/R$dimen.class
	BBartersMobile/bin/classes/com/bbarters/bbartersmobile/R$drawable.class
	BBartersMobile/bin/classes/com/bbarters/bbartersmobile/R$id.class
	BBartersMobile/bin/classes/com/bbarters/bbartersmobile/R$integer.class
	BBartersMobile/bin/classes/com/bbarters/bbartersmobile/R$layout.class
	BBartersMobile/bin/classes/com/bbarters/bbartersmobile/R$menu.class
	BBartersMobile/bin/classes/com/bbarters/bbartersmobile/R$raw.class
	BBartersMobile/bin/classes/com/bbarters/bbartersmobile/R$string.class
	BBartersMobile/bin/classes/com/bbarters/bbartersmobile/R$style.class
	BBartersMobile/bin/classes/com/bbarters/bbartersmobile/R$styleable.class
	BBartersMobile/bin/classes/com/facebook/android/R$attr.class
	BBartersMobile/bin/classes/com/facebook/android/R$id.class
	BBartersMobile/bin/classes/com/facebook/android/R$styleable.class
	BBartersMobile/bin/classes/com/origamilabs/library/R$attr.class
	BBartersMobile/bin/classes/com/origamilabs/library/R$styleable.class
	BBartersMobile/bin/dexedLibs/android-query-full.0.26.7-70c978b6c18c3f872d9a94e179b98907.jar
	BBartersMobile/bin/dexedLibs/android-support-v4-a251b1b879fec5bf30a915eacef5004f.jar
	BBartersMobile/bin/dexedLibs/android-support-v7-appcompat-212db11f786edcf081976bd263aa59e8.jar
	BBartersMobile/bin/dexedLibs/annotations-23306d58b89c9a8e6e1479880a70ed77.jar
	BBartersMobile/bin/dexedLibs/appcompat_v7-751106146e9ca47edc6b2401cd68f42d.jar
	BBartersMobile/bin/dexedLibs/bolts-android-1.1.2-d33847bf99aff5698a9a7a48176a5967.jar
	BBartersMobile/bin/dexedLibs/facebooksdk-d93f34e10ac6cc178dc19ffab9d8533c.jar
	BBartersMobile/bin/dexedLibs/google-play-services-c916c532d0f2a8ab386f09d6a98b03e0.jar
	BBartersMobile/bin/dexedLibs/google-play-services_lib-6b20f1e3fd03ee94061b80e1136ef543.jar
	BBartersMobile/bin/dexedLibs/listviewanimations_lib-core-slh_3.1.0-4f8066aa81ce8a518144bc19046bca5a.jar
	BBartersMobile/bin/dexedLibs/listviewanimations_lib-core_3.1.0-82287e9aa8c292baba30714fbff7f6ea.jar
	BBartersMobile/bin/dexedLibs/listviewanimations_lib-manipulation_3.1.0-9840c3e3b2dff88711656cd7b1b88890.jar
	BBartersMobile/bin/dexedLibs/nineoldandroids-2.4.0-9b7a5f578e2881c632b403acab0ad8e1.jar
	BBartersMobile/bin/dexedLibs/picasso-2.4.0-9fb5fcb437dcdb4360f87a04b5c0598c.jar
	BBartersMobile/bin/resources.ap_
	BBartersMobile/gen/android/support/v7/appcompat/R.java
	BBartersMobile/gen/com/bbarters/bbartersmobile/R.java
	BBartersMobile/gen/com/facebook/android/R.java
	BBartersMobile/gen/com/origamilabs/library/R.java
	BBartersMobile/project.properties
git ignore