updated versions
refer to master branch
fixed version pinning, use specific commit for the cookbook
Merge branch 'maarch'

Conflicts:
	stack/lapp/buildout.cfg