changeset1
Merge branch 'master' of https://github.com/ganybtech/Test

Conflicts:
	content.properties