Seith check with alerts
Merge branch 'master' of https://github.com/MCAinternet/MCATrap

Conflicts:
	config.xml
read me