Merge branch 'master' into Kelly
urgh .class shit
Merge branch 'master' into Kelly
WHAT IS HAPPENING
Merge branch 'master' into Kelly
fixed popup dialogs
Merge branch 'Kelly'