added login feature
Merge branch 'master' of https://github.com/afrishal/sharloc

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/R.txt
	bin/Sharloc.apk
	bin/classes.dex
	bin/classes/com/sharlocstudio/sharloc/FriendsFragment.class
	bin/classes/com/sharlocstudio/sharloc/HomeFragment.class
	bin/classes/com/sharlocstudio/sharloc/MainActivity.class
	bin/classes/com/sharlocstudio/sharloc/NearMeFragment.class
	bin/classes/com/sharlocstudio/sharloc/ProfileFragment.class
	bin/classes/com/sharlocstudio/sharloc/R$id.class
	bin/classes/com/sharlocstudio/sharloc/R$integer.class
	bin/classes/com/sharlocstudio/sharloc/R$layout.class
	bin/classes/com/sharlocstudio/sharloc/R$menu.class
	bin/classes/com/sharlocstudio/sharloc/R$plurals.class
	bin/classes/com/sharlocstudio/sharloc/R$string.class
	bin/classes/com/sharlocstudio/sharloc/R$style.class
	bin/classes/com/sharlocstudio/sharloc/R$styleable.class
	bin/classes/com/sharlocstudio/sharloc/activities/NFCActivity.class
	bin/classes/com/sharlocstudio/sharloc/activities/QRCodeActivity.class
	bin/classes/it/gmariotti/cardslib/library/R$id.class
	bin/resources.ap_
	gen/com/sharlocstudio/sharloc/R.java
	gen/it/gmariotti/cardslib/library/R.java