fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	X-Junior-core/xjunior-core.iml
fixes