fixed a few bugs and added env with amazon s3 info
Merge branch 'master' into map

Conflicts:
	app/assets/javascripts/application.js
fixed audio s3 bug
Merge pull request #22 from gsperka/map

Map