fileupload in markdown
s3 bucket ploy
Merge commit '1458aa82ea11d23f308eeccd6f3d3a0ca1a6a25e' into wip/140304_file_uploader

Conflicts:
	Gemfile
s3 file upload
clear cache after deploy
Merge branch 'master' of github.com:tadyjp/rendezvous
Merge commit '8c6ad9e06e5884e781f53cc7533d537869249f12'
bundle