Fix some bugs #2
Merge branch 'master' of https://github.com/thumbtack-technology/training-2013-portal