emoved all atm specific codings and replaced with more generic iconmap
codings
changed author
Merge branch 'master' into recycling

Conflicts:
	README.md
	webcontent/iconmap.js
	webcontent/iconmaputils.js
	webcontent/index.html