Added errors on file size
Merge branch 'master' into file_size_errors

Conflicts:
	spec/uploader/callback_spec.rb
Fix specs for file size validation