Merge branch 'hotfix-v1.0.1'
Fix conflict management abort.

Now if you don't resolve conflicts, the merge
will be aborted, so you can change feature,
or fix the conflict.

Some correction to the readme file.
Merge branch 'hotfix-v1.0.2' into develop
Added logs comands and fix help
Added diff, logs and push

Added diff command.
Added log, log2 and xlog.
Added push that push master and develop.
Merge branch 'feature-feature-logandhelp' into develop