Updated link to live
Merge branch 'dev'