added spamspan and token_filter
Merge branch 'develop' into 7.x-1.x