- GeoServer Enterprise: 2.4.x Master Structure
 - resolving merge conflicts with master
 - enterprise data dir
Merge pull request #119 from afabiani/gs-2.4.x-backPort

Gs 2.4.x back port
- Issue #120