Modified the main menu screen
Fixed conflicts
Added some animations
Merge branch 'dev_1.0' into issue_6
Merge branch 'issue_6' into dev_1.0