Stopped tracking buildcharacter.properties
Merge branch 'develop' of https://github.com/AndreVanDelft/scala into develop

Conflicts:
	buildcharacter.properties