* 改回原来
* 添加Selector
*
Merge branch 'master' of https://github.com/lisz1991/Magazine

Conflicts:
	project.properties