pg
Merge remote-tracking branch 'origin/master'

Conflicts:
	PrettyGirl_android/src/com/neo/prettygirl/MainActivity.java