Added: composer.lock
Merge branch 'badupgrade' of github.com:tenjava/website into badupgrade