dojo-war merged with the main pom.xml
dojo-war merged with the main pom.xml
Merge branch 'development' of github.com:encuestame/encuestame into development

# Via Juan Carlos Picado (10) and others
* 'development' of github.com:encuestame/encuestame:
  updated readme
Removed unused submodules
Improved the dojo build process
Updated submodules
Moved class to json module
Fixed bug on security permission detection
Custom jsp error pages
Removed unused xml file
Default locale ENGLISH is user locale is missing
Moved class to json module
Disabled layers, cause issues in dojo build with v1.9.3
Replaced barcoded version by parameter
Renamed pom names
Moved war web app to new web-app  module
ignored IDE generated files
Updated widget submodule
Merge branch 'master' of github.com:encuestame/encuestame

# By Encuestame CI
# Via Encuestame CI
* 'master' of github.com:encuestame/encuestame:
  [enme ci] Automated branch merge (from development:69c8ad7d075d879b352e03ff02d55711891758bf)

Conflicts:
	enme-js/resources-enme-war/src/main/resources/resource/js/me
	enme-js/resources-enme-war/src/main/resources/resource/js/widget