trest
Merge remote-tracking branch 'origin/master'

Conflicts:
	diablo/src/main/java/com/tuan/diablo/App.java