Merge branch 'hotfix/1.1.2' into develop
Update puppet scripts
Update readme
Merge branch 'develop' of https://github.com/laxu/vagrant-lampn into develop
Úpdate Vagrantfile
Merge branch 'release/1.2'