refactor update
Merge branch 'master' of github.com:stijnhens/socialgeo

df