entity and token
Merge branch 'master' of github.com:kraigh/promos
swapped to dev version of amazon s3, added content complete module