Merge branch 'master' of https://github.com/m1688/Hirebird into notification

Conflicts:
	res/values/colors.xml
	res/values/dimens.xml