Upgrade stuff
Move CMore logo to top right corner
Merge branch 'stage'