+ deploying an anisotropic resource map
+ merge
Merge branch 'master' of https://github.com/xrubio/pandora

Conflicts:
	pandora/examples/gujaratCellphones/config.xml