Commit All
Merge origin/master