more working stuff
Merge branch 'master' of https://github.com/cessien/communitydirectory