Merge branch 'develop' into games
add games to user dashboard
add best in place gem
add game edit in place support
Merge branch 'games' into develop