Refactored first 45 lines of code and added set_team
Merge https://github.com/IdeaHat/expertiza into rails4