small tweaks and changes to config
Merge branch 'master' of https://github.com/leaflet757/cs20

Conflicts:
	resources.xml