Merge branch 'master' into develop-refactoring-rspec

Conflicts:
SyncMe/rSyncMeNow.rb