merge
Merge branch 'master' of https://github.com/Hajimex/zenclerk_allpossibility

Conflicts:
	tmp/atomc_filters.coffee