Added website field to instrument refs #1923
Added ammap data function and counters for related content tabs
Merge branch 'master' of https://github.com/dragos-dumi/cms.instrument into dragos-dumi-master

Conflicts:
	cms_instrument.info