Allowing files with a ".txt" extension to be uploaded.  Displaying an error message when files that are not-allowed are submitted.
Merge branch 'master' of github.com:tendenci/tendenci