second carrierwave, images upload on cheerups working
sounduploader added
Merge branch 'development' of github.com:AdamGoodApp/cheerup into development

Conflicts:
	app/views/cheer_ups/_form.html.erb
	log/development.log