Added Android Beam. Started working on Database.
Merge branch 'master' of https://github.com/parthibanloganathan/Friend-o-matic

Conflicts:
	Friend-o-matic/bin/classes/com/parthi/friendomatic/MainActivity$1.class
	Friend-o-matic/bin/classes/com/parthi/friendomatic/MainActivity.class
	Friend-o-matic/bin/classes/com/parthi/friendomatic/MainFragment$1.class
	Friend-o-matic/bin/classes/com/parthi/friendomatic/MainFragment$2.class
	Friend-o-matic/bin/classes/com/parthi/friendomatic/MainFragment$3.class
	Friend-o-matic/bin/classes/com/parthi/friendomatic/MainFragment.class
	Friend-o-matic/bin/classes/com/parthi/friendomatic/R$id.class
	Friend-o-matic/bin/classes/com/parthi/friendomatic/R$layout.class
	Friend-o-matic/bin/classes/com/parthi/friendomatic/R$menu.class
	Friend-o-matic/bin/classes/com/parthi/friendomatic/R$string.class
	Friend-o-matic/bin/classes/com/parthi/friendomatic/R$style.class
	Friend-o-matic/bin/classes/com/parthi/friendomatic/R$styleable.class
	Friend-o-matic/bin/classes/com/parthi/friendomatic/UserID.class
Deleted class files