no message
Merge branch 'master' of https://github.com/Stigol-LLC/Divitron

Conflicts:
	Assets/Settings.asset
	Assets/SettingsXCode.asset