Merge branch 'master' of https://github.com/ponghub/ponghub-core

Conflicts:
app/views/_navbar.html.erb
conflict navbar