Fix travis
Merge
Merge branch 'first_website' into cloud_service