Extra at sign on twitter handles specified with an at sign
use file extension of uploaded xlsform
test for xlsx xlsform download
Merge branch 'master' into xlsxdm

* master:
  Fixed tests to expect _uuid and _submission_time columns
  Added optional arg to make_submission to overide submission time for fixtures testing
  Updated README with utf8 note
  Added xls export fixture
  Added _uuid and _submission_time to xls export
  Added _uuid and _submission_time to csv exports

Conflicts:
	main/tests/test_process.py
explicit call to _publish_xls_form
Merge pull request #987 from modilabs/double_at_on_twitter

Extra at sign on twitter handles specified with an at sign
Merge branch 'master' into xlsx_xlsform_download

* master:
  Extra at sign on twitter handles specified with an at sign
Updated leaflet to 0.5.1 - #954 - [ci skip]
use django_nose.NoseTestSuiteRunner
Merge pull request #988 from modilabs/xlsx_xlsform_download

#984 allow xlsx xlsform download
Added version nos to leaflet resources [ci skip]
Merge pull request #989 from modilabs/954_update_leaflet

Updated leaflet to 0.5.1 - [ci skip]
use NoseTestSuiteRunner
nose fixture bundling
LF
OS specific lineendings
Merge branch 'master' into nosetest

* master:
  OS specific lineendings
  LF
  Added version nos to leaflet resources [ci skip]
  Updated leaflet to 0.5.1 - #954 - [ci skip]
  explicit call to _publish_xls_form
  test for xlsx xlsform download
  use file extension of uploaded xlsform
return empty string if file does not exist
display xlsform publishing exception to user and email to admins as well
Merge pull request #994 from modilabs/show_pyxform_exceptions

display xlsform publishing exception to user and email to admins as well