CDB-728 #resolves Adds custom error message for free accounts over map view quota + specs
CDB-728 #resolves Adds custom error message for free accounts over map view quota + specs.
CDB-765 #resolve - added text-placement css property for labels
bug/CDB-565 Whitelist infowindow attributes for VizJSON v2
added upgrade button when user reachs limits
added utm_content to upgrade now button
CDB-741 #resolve Do not attach Mixpanel on develop

When Mixpanel token is set to "" at user_info, Mixpanel events
will not be attached to the God.
Merge remote-tracking branch 'origin/bug/CDB-565' into release/2.6.0
Merge remote-tracking branch 'origin/feature/CDB-728' into release/2.6.0
Merge remote-tracking branch 'origin/fix/CDB-741' into release/2.6.0
Merge remote-tracking branch 'origin/feature/CDB-756' into release/2.6.0

Conflicts:
	lib/assets/javascripts/cartodb/dashboard/dashboard_messages.js
Merge remote-tracking branch 'origin/feature/CDB-765' into release/2.6.0