Merge branches 'master' and 'live' into live
Remove some of debugging lines from screen
Merge branches 'live' and 'master'