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

Conflicts:
	spec/uploader/callback_spec.rb
Fix specs for file size validation
Bump fog dev dependency to 1.25.0
Create postgres database, not mysql anymore
Postgres 9.3 on Travis
add chinese i18n locale file
Fix bug with remove_previously_stored_#{column} callback, when updating in a transaction, and that process is rollback. Again~
Merge pull request #1503 from huacnlee/fix_remove_previously_stored_in_transactions

Fix bug with remove_previously_stored_#{column} callback, when updating in a transaction, and that process is rollback. Again~
Remove duplicate pending spec
Merge pull request #1502 from msyesyan/add_chinese_i18n_file

add chinese i18n locale file
Add 4-2-stable to testing