changed some shit
Merge branch 'master' of https://github.com/cnduru/sw7_frontend