increase file name from 200 to 250
version bump
integrate travis ci to push message files to transifex
minor fix transifex
#1017 - Allow Commas in all Text Fields
Merge branch 'master' of https://github.com/tendenci/tendenci
1044 - Merge from bixly-testing
Fixed merge errors
replace tendenci blog feed with a link to prevent tendenci.com from being hit too much. besides, that feed url is no longer valid [ci skip]
version bump to 5.1.372 [ci skip]
#1065 - Trendsetters Engineering: Admin backend error when adding new item to "News"
#1063 - Replace Bootstrap 2 with Bootstrap 3
Merge branch 'master' into bixly-testing

Conflicts:
	tendenci/addons/corporate_memberships/forms.py
	tendenci/addons/directories/templates/directories/pricing-add.html
	tendenci/addons/directories/templates/directories/pricing-edit.html
	tendenci/addons/events/templates/events/include/events-registration-summary.js
	tendenci/addons/events/templates/events/reg8n/include/register-registrant.js
	tendenci/addons/events/templates/events/reg8n/register-confirm.html
	tendenci/addons/events/templates/events/reg8n/register.html
	tendenci/addons/events/templates/events/reg8n/register_pre2.html
	tendenci/addons/events/templates/events/reg8n/registration_pricing.html
	tendenci/addons/events/views.py
	tendenci/addons/jobs/templates/jobs/pricing-add.html
	tendenci/addons/jobs/templates/jobs/pricing-edit.html
	tendenci/addons/memberships/templates/memberships/default_export.html
	tendenci/addons/memberships/utils.py
	tendenci/apps/discounts/forms.py
	tendenci/core/base/fields.py
	tendenci/templates/base.html
	tendenci/templates/reports/active_members_ytd_print.html
	tendenci/templates/reports/base.html