create machine
create machine from image
tags
Merge branch 'jqm-1.3' of git@github.com:mistio/mist.io.git into jqm-1.3

Conflicts:
	src/mist/io/static/js/app.js