Merge branch 'features/styles' into dev
menu fixed
Merge branch 'features/about' into dev