unified features creation and add frevert command
"release fmerge" is not the same as "fmerge"
fix about "af rebase"
Merge branch 'master' of https://github.com/stsp/git-aflow

Conflicts:
	docs/git-aflow.txt
Merge branch 'master' of https://github.com/stsp/git-aflow

Conflicts:
	docs/git-aflow.txt
feature branches are never removed, moved to backup

This is needed for the rebase process to know which features
were created locally, and which were not.
notes about merging conflicting features
add "fmerge" command

it is used by "release fmerge" and other tools
rebase should remove backup
clarify about staging development features
more comment on the staging development features
Merge pull request #3 from stsp/master

updates for last descussion