Merge branch 'dev' of https://github.com/zhuyifan2013/Memo into dev
Merge branch 'dev' of https://github.com/zhuyifan2013/Memo into dev

Conflicts:
	app/src/main/res/drawable-xxhdpi/actionbar_bg.xml
	app/src/main/res/values/strings.xml