Merge branch 'provision-by-template'
Merge branch 'ami-builder'

Conflicts:
	src/main/java/hudson/plugins/ec2/EC2Cloud.java
Set version number