Merge branch 'release/0.10'
checked in for review comments
fixed url patterns
Merge branch 'master' of github.com:runmycode/tyler into feature/issue8-companionpages
Merge branch 'feature/issue8-companionpages' into develop
Merge branch 'release/0.11'
ignored env directory, it contains env heroku files