Revert "Commit 2014,07-02"

This reverts commit fd60d5b6c44ba7fad744052e5d815bb34f21a590.
Revert "Revert "Commit 2014,07-02""

This reverts commit 77bf46d90ab25972451d0f23f4896cdc9a374101.
Merge branch 'master' of https://github.com/gsbullmer/doa2-team-generator