Update box
Merge branch 'tools/ubuntu-trusty64' into tools/yeoman

Conflicts:
	CHANGELOG.md
	README.md
	docs/technology_stack.md