Merge branch 'master' into develop
Sort menu items
Add action suffix to all menu action methods
Add proper save method

It will remove trailing whitespace and add CR at EOF
Merge pull request #3 from zenangst/develop

Add proper save method