add create trade button
Create staging environment
merge master
Merge branch 'master' of https://github.com/fantasypolitics/startupweekendmvp

Conflicts:
	Gemfile.lock
merge staging Merge branch 'master' of heroku.com:fantasypolitics-staging
Add skylight to staging env, use env variables for auth keys
add conditional hiding trading link if user = team user
Merge branch 'master' of heroku.com:fantasypolitics-staging into develop
Make changes to secrets.yml
Merge branch 'master' of heroku.com:fantasypolitics-staging into develop
change new trade copy
Use ENV variables for sunlight app id
hide create league button
merge staging Merge branch 'master' of heroku.com:fantasypolitics-staging
Fix references to sunlight -> skylight
Merge branch 'master' of heroku.com:fantasypolitics-staging into develop
change team update route to redirect to league page
merge staging Merge branch 'master' of heroku.com:fantasypolitics-staging
Add some design to the trade#show page
Redesign user/show with a tabbed interface
Merge branch 'master' of heroku.com:fantasypolitics-staging into develop