Edit top bar
Merge branch 'master' of github.com:palaloi/ist-ploy
Resolve conflict