[vagrant] fixed parameters.yml puppet template and apache lock dir permissions
Merge pull request #77 from erikaheidi/vagrant

[vagrant] fixed parameters.yml template and apache lock dir permissions
Updated lock file
Always show the link to main page no matter what outcome
Merge pull request #82 from CoBase/registration-forward

Always show the link to main page no matter what outcome
Updated composer lock file
Switched vagrant box for one with guest additions included
Merge pull request #86 from CoBase/vagrant-box-fix

Switched vagrant box for one with guest additions included
Merge branch 'master' into api

Conflicts:
	composer.lock