Added Edit box to Profile Show page
Merge branch 'master' of https://github.com/basisworldwide/SumTV

Merge comment
Merge branch 'master' of https://github.com/basisworldwide/SumTV

Master merge
Added ability to update Links on Profile edit page and display on Profile show page
Fixed merge issue in schema.rb