Raul Ochoa 3af2136770 Merge branch 'master' into standalone-server ...

Conflicts:
	lib/cartodb/cartodb_windshaft.js
	lib/cartodb/monitoring/health_check.js

2015-09-04 13:21:54 +02:00

..

cartodb

Merge branch 'master' into standalone-server

2015-09-04 13:21:54 +02:00