Fixed issue 728. Uploading an invalid CSV file now shows an error message.
Added error message if encoding of the uploaded file is incorrect. Improved error message and fixed comment typo.
fix issue-1019, added alert warning
Merge pull request #1198 from daniyall/issue-728

Fixed issue 728. Uploading an invalid CSV file now shows an error message
Correct typo in models/user.rb
fixing french locales for marking_incomplete_warning
Merge pull request #1200 from wroy/issue-1019

fix issue-1019, added alert warning