Preparing the project for a tag
Part 2 - Bootstrapping the application
Merge remote-tracking branch 'origin/master' into dev