wtf
Merge branch 'master' of https://github.com/alfiewm/ballin-ninja

Conflicts:
	YourFavApps/AndroidManifest.xml
	YourFavApps/res/layout/activity_fav_main.xml
	YourFavApps/src/com/mengwang/ui/activity/FavMainActivity.java