Reorganize code after changing database, part 3
Merge branch 'create_traineeship' of https://github.com/thumbtack-technology/training-2013-portal into create_traineeship