added tag filtering
Merge branch 'master' of git@github.com:ColdTrick/user_support.git