Merge branch 'master' into dev
opitmising UI
text wrap on list items
Merge branch 'dev'