Merge branch 'devel'
Add box file for AWS
Merge branch 'master' into devel