daily commit
miao
miao
Merge branch 'master' of github.com:dodocat/Argon

Conflicts:
	Argon/build.gradle
	Argon/src/main/res/anim/anim_breath.xml
	Argon/src/main/res/values/styles.xml
	ArgonSample/build.gradle
	ArgonSample/src/main/java/org/quanqi/argon/sample/DumpActivity.java
	gradle/wrapper/gradle-wrapper.properties