Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/resources.ap_

Merge remote-tracking branch
'origin/master'

Conflicts:
	bin/resources.ap_

Merge remote-tracking
branch
'origin/master'

Conflicts:
	bin/resources.ap_

Merge
remote-tracking
branch
'origin/master'

Conflicts:
	bin/resources.ap_

Merge
remote-tracking
branch
'origin/master'

Conflicts:
	bin/Palplay.apk
	bin/classes/com/palplay/taffy/R$id.class
	bin/classes/com/palplay/taffy/R$layout.class
	bin/classes/com/palplay/taffy/R$menu.class
	bin/classes/com/palplay/taffy/R$string.class
	bin/classes/com/palplay/taffy/R$style.class
	bin/classes/com/palplay/taffy/SigninPage.class
	bin/classes/com/palplay/taffy/SignupPage$RegisterThread.class
	bin/classes/com/palplay/taffy/SignupPage.class
	bin/classes/com/palplay/taffy/UploadMusicActivity.class
	bin/classes/com/palplay/taffy/library/MyListAdapter.class
	bin/dexedLibs/android-support-v4-ddc2aeebccc1a816f224495ff25abdd4.jar
	bin/resources.ap_

Merge
remote-tracking
branch
'origin/master'

Conflicts:
	bin/Palplay.apk
	bin/classes/com/palplay/taffy/R$id.class
	bin/classes/com/palplay/taffy/R$layout.class
	bin/classes/com/palplay/taffy/R$menu.class
	bin/classes/com/palplay/taffy/R$string.class
	bin/classes/com/palplay/taffy/R$style.class
	bin/classes/com/palplay/taffy/SigninPage.class
	bin/classes/com/palplay/taffy/SignupPage$RegisterThread.class
	bin/classes/com/palplay/taffy/SignupPage.class
	bin/classes/com/palplay/taffy/UploadMusicActivity.class
	bin/classes/com/palplay/taffy/library/MyListAdapter.class
	bin/dexedLibs/android-support-v4-ddc2aeebccc1a816f224495ff25abdd4.jar
	bin/resources.ap_

Merge
remote-tracking
branch
'origin/master'

Conflicts:
	bin/Palplay.apk
	bin/classes.dex
	bin/classes/com/palplay/taffy/Flash.class
	bin/classes/com/palplay/taffy/Intropage.class
	bin/classes/com/palplay/taffy/PlayMusicActivity.class
	bin/classes/com/palplay/taffy/Profile.class
	bin/classes/com/palplay/taffy/R$id.class
	bin/classes/com/palplay/taffy/R$layout.class
	bin/classes/com/palplay/taffy/R$menu.class
	bin/classes/com/palplay/taffy/R$string.class
	bin/classes/com/palplay/taffy/R$style.class
	bin/classes/com/palplay/taffy/SigninPage$LoginThread.class
	bin/classes/com/palplay/taffy/SigninPage.class
	bin/classes/com/palplay/taffy/SignupPage$RegisterThread.class
	bin/classes/com/palplay/taffy/SignupPage.class
	bin/classes/com/palplay/taffy/UploadMusicActivity.class
	bin/classes/com/palplay/taffy/library/MyListAdapter.class
	bin/resources.ap_
	gen/com/palplay/taffy/R.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	bin/classes/com/palplay/taffy/R$id.class
	bin/classes/com/palplay/taffy/R$layout.class
	bin/classes/com/palplay/taffy/R$menu.class
	bin/classes/com/palplay/taffy/R$string.class
	bin/classes/com/palplay/taffy/R$style.class
	bin/classes/com/palplay/taffy/SigninPage.class
	bin/classes/com/palplay/taffy/SignupPage$RegisterThread.class
	bin/classes/com/palplay/taffy/SignupPage.class
	bin/classes/com/palplay/taffy/UploadMusicActivity.class
	bin/classes/com/palplay/taffy/library/MyListAdapter.class