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