fix features
Merge branch 'develop' of github.com:itbeaver/koding_hackathon_track_room into develop