Merge branch 'master' of https://github.com/Rekoe/rk_app.git