Merge origin/master

Conflicts:
	pom.xml
	src/main/java/mycode/codetips/App.java