Removed leftover debugging code
Changed definition warning into warning
Added Heads Up definition and replaced Warning definition with it
Merge branch 'work4' into production
Merge branch 'work5' into production