coverage
coverage
updated
updated
removed prawn
Merge branch 'master' into cleansing

Conflicts:
	Gemfile.lock
	coverage/.last_run.json
	coverage/.resultset.json
	coverage/index.html
coverage
cleansing
updated
updated
updated
updated
fixed master
fixed carrierwave/fog
Merge branch 'master' into develop
updated
updated
update
updated
Merge branch 'master' into develop