remember promise
use amazon s3/cloudfiles
no more cloudfiles
Merge branch 'master' into angular1.2.3