Merge pull request #6 from ningosi/master

Fixes for OCLM-3 and OCLM-4
Added aoi token to the configure page OCLM-15