Merge branch 'master' into frontend
Finished mobile theming
Finished mobile theming
Merge branch 'frontend'