Fix Concept and Source classes
Merge branch 'master' of https://github.com/socialsensor/socialsensor-framework-common.git