facebook login
g+ OK
g+ OK
g+ OK
Merge branch 'master' of github.com:yathit/sample-image-store-s3

Conflicts:
	index.html
	js/app.js
	js/gapi-loader.js
merge
listing object test
ass s3 http client
ass s3 http client