Merge branch 'develop'
Merge branch 'develop'
Merge pull request #36 from Drosty/develop

Merge Develop into Master
Merge pull request #40 from Drosty/develop

if team name nil try removing periods and try again
Merge pull request #43 from Drosty/develop

Bunch of bug fixes and features added
Merge pull request #44 from Drosty/develop

only pass in invite - use helpers in erb for url
Merge pull request #45 from Drosty/develop

add default_url_options for production mailer
Merge pull request #56 from Drosty/develop

AngularJs merged to Master
Merge pull request #58 from Drosty/develop

Add / Remove players easier
Merge pull request #59 from Drosty/develop

redirect_to added back in from stupid replace all
Merge pull request #69 from Drosty/develop

Feature Bug Fixes
Merge branch 'develop'
Merge pull request #71 from Drosty/develop

change pk to k for available positions
Merge pull request #75 from Drosty/develop

Admin and Player Add/Remove
Merge branch 'develop'
Merge branch 'develop'
activity tied to team - not user

This is because if user in multiple leagues it will show activity in
all the leagues for that user in activity page
Merge branch 'master' into develop