adding context datasources
Merge branch 'master' of http://github.com/spatialdev/OAM-PUBLIC