Issues 101 and 99
Issue 98 and code clean up
No ticket: email template changes
Merge branch 'master' into dev

Conflicts:
	net.ostis.confman.model/src/net/ostis/confman/model/datastore/local/convert/ConverterFromStorageProvider.java