remove the MyFriendsData2 parent folder
Merge branch 'master' of github.com:minglu/FacebookFriendsInfo

Conflicts:
	src/org/my/FriendsAlgorithm/FacebookFriens.java
	src/org/my/FriendsAlgorithm/facade/Facade.java