Adds some sorting framework
Merge branch 'master' of https://github.com/dacurtis/Teambuilder