post. Global-Conflict.
changes
update header
Merge branch 'master' into 2014-08-18-global-conflict
Merge pull request #45 from CartoDB/2014-08-18-global-conflict

2014 08 18 global conflict