rendering added
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/company/AppHelper.java
	src/com/company/MyObject.java
packages added