Changed s3 and updated admin page
Merge branch 'master' of github.com:jmejia/store_engine