rename
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/src/main/java/com/jlab/demo/SimpleApp2.java
rename