test conflict
Merge branch 'master' of https://github.com/rotek/rotek

Conflicts:
	src/main/java/com/rotek/constant/AboutType.java
resovle
Merge branch 'master' of https://github.com/rotek/rotek