fixed issue on sub requests page; closes #1069
Merge pull request #1080 from affektive/subs

fixed issue on sub requests page; closes #1069
fixed teaspoon test
Merge pull request #1099 from affektive/teaspoon

fixed teaspoon test
Merge branch 'master' into mixpanel_stub