Merge branch 'hotfix/1.0.2'
Gemfile: Update test-kitchen and kitchen-vagrant.
nginx: Set client_max_body_size to zero.

This removes the 1MB limit on the size of upload requests.
Merge branch 'hotfix/1.0.3' into develop

Conflicts:
	CHANGELOG.md
	Gemfile
	Gemfile.lock
	metadata.rb
	templates/default/nginx-config.erb