Fix the git mess: remove unfinished features from master branch

[nightsh]

Create a feature branch for each new feature.

• New commit rolling back the new options added in menu
• Checkout a new branch for the new stuff
• Commit them there

master branch will be only for stable.

development branch will be used for testing and integration.

Feature branches and occasional release branches, are all temporary. I'm thinking of a possible adoption of git-flow model, will see about that. Will update the issue with a link to the wiki, explaining the process.