Moved logo to the right position
Merge branch 'development' (testing)