Added some notes about rebase.
Merge branch 'dev'