Updated framework repo and set branch to master
Merge from develop branch - constants pointing to cgkineo master branch of adapt_framework