Merge branch 'feature/data_transfer_from_csv_77' into develop

Conflicts:
	test/functional/web/users_controller_test.rb
	test/test_helper.rb
Merge branch 'develop' of https://github.com/kaize/itc73 into feature/social_bugs_fix_79
Addinf export to csv
Merge branch 'feature/social_bugs_fix_79' into staging

Conflicts:
	Gemfile