Commit to merge
Merge branch 'master' of https://github.com/socialsensor/socialsensor-multimedia-analysis.git