Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/.gitignore
sync
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/values/strings.xml
Merge pull request #1 from holmesli/LoginActivity

login activity
update member detial
sync
Merge remote-tracking branch 'origin/master'

Conflicts:
	gen/com/app/tomore/R.java
	res/values/strings.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/values/strings.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/ToMoreTest.apk
	bin/classes.dex
	bin/resources.ap_
	gen/com/app/tomore/R.java
	res/values/strings.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/ToMoreTest.apk
	bin/classes.dex
	bin/resources.ap_
	gen/com/app/tomore/R.java
	res/values/strings.xml
sync
update magzine detail
update magzine detail
sync
Merge remote-tracking branch 'origin/master'

Conflicts:
	gen/com/app/tomore/R.java
	res/values/strings.xml
update member detail
sync
clean
update member detail
sync