minor fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/rk/framely/tileentity/TileEntityFrameBase.java