Add s3 support
Merge branch 'master' of github.com:iLeoable/Discounter-PhoneGap