ticket:2
1. Removed wrong projects from repo.
Merge branch 't3_edit_user_data'

Conflicts:
	CoffeeCupsTest/libs/robotium-solo-4.2.jar
	CoffeeCupsTest/project.properties
	CoffeeCupsTest/res/drawable-hdpi/ic_launcher.png
	CoffeeCupsTest/res/values/strings.xml
	CoffeeCupsTest/res/values/styles.xml
	CoffeeCupsTest/src/com/coffeecupstest/Database/CoffeeCupDataSource.java
	CoffeeCupsTest/src/com/coffeecupstest/Database/CoffeeCupDatabase.java
	CoffeeCupsTest/src/com/coffeecupstest/UserItem.java
	FacebookLogin/AndroidManifest.xml
	FacebookLogin/project.properties
	FacebookLogin/res/layout/activity_main.xml
	FacebookLogin/src/com/facebooklogin/CoffeeCupDataSource.java
	FacebookLogin/src/com/facebooklogin/MainActivity.java