Merged Branches
Tried something
Updated core file
Merge branch 'origin/master'

Conflicts:
	version.xml