add new item types
Merge branch 'github_master' into heroku-master