_
Merge branch 'master' of https://github.com/qwer-team/galaxy-frontend