Advanced Marker Filtering
Merge branch 'master' of git@github.com:bluemoep/LocalTwitter.git