CDB-1638 Added support for layer activation/deactivation using placeholders like 'layer0'
Merge branch 'privacy-maps' of https://github.com/CartoDB/cartodb into privacy-maps