Starting menu
Merge remote-tracking branch 'larthienn/master'
commiting changes (without prior rebase - to show rebase problems)