commit before pull
Merge branch 'master' of https://github.com/culturemesh/culturemeshdevteam
configured to work better on site