Merge pull request #1 from bluelaguna/resync

New 'resync' command
Merge pull request #2 from bluelaguna/build

Build
Merge pull request #3 from bluelaguna/develop

Sync with develop
Merge pull request #4 from bluelaguna/master

Master