let's try some things [EDIT]
Merge branch 'master' of https://github.com/colorthought/app-socialdataminingtemp.git
working backwards...