sync
sync
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/.gitignore
	gen/com/app/tomore/R.java
	src/com/app/tomore/MagDetailActivity.java
	src/com/app/tomore/MainMagActivity.java
	src/com/app/tomore/fragment/Fragment_BacktoMainPage.java
	src/com/app/tomore/fragment/Fragment_BlackListPage.java
	src/com/app/tomore/fragment/Fragment_LogoutPage.java
	src/com/app/tomore/fragment/Fragment_MyThread.java