Updarte
Merge branch 'master' of https://github.com/zrero/weScanTickets

Conflicts:
	www/config.xml