[Emulink]
Merge branch 'emulink-commented' into beta
* emulink-commented:
  [Emulink]

Conflicts:
	public/pvsioweb/app/plugins/emulink/Emulink.js