team line modified
Merge branch 'dev' of github.com:masymbol/masymbol into dev