minor update, added selector for pop up and moved the "bottom" anchor
Merge branch 'tricks' into dev
Merge branch 'dev' into gamemaster