修改addDeleteFolderActivity的delete按钮的弹出效果
Merge branch 'tiandiyifuyou' of https://github.com/linyxy/Ticker into tiandiyifuyou
修改addDeleteFolderActivity的delete按钮的弹出效果
修改delete效果
合并用
完成合并

Merge branch 'sky'

* sky:
  修改delete效果
  修改addDeleteFolderActivity的delete按钮的弹出效果
  修改addDeleteFolderActivity的delete按钮的弹出效果

Conflicts:
	bin/R.txt
	gen/android/support/v7/appcompat/R.java
	res/values/styles.xml
	src/com/earth/ticker/AddDeleteFolderActivity.java
	src/com/earth/ticker/fragment/FolderFragment.java