Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'master' of github.com:encuestame/encuestame
Merge branch 'development'
Merge branch 'development'
updated readme
Merge remote-tracking branch 'origin/development'

* origin/development: (41 commits)
  Disabled configuration by xml file
  Fixed test cases
  finished @Configuration support
  success configuration
  Fixed test cases, cron based on placeholder resolver
  Migrated to Servlet 3.0, enabled web flow and added encuestame-config as module
  Migrated to @Configuration way, added @Scheduled instead xml configuration, @Components instead xml configuration
  New module, enme-config, new configuration based on spring @Configuration
  Test cases.
  Get comment user modified.
  CommentDao has been modified to allow multiple options to retrieve comments
  Fixed setup page.
  Comment moderation message in progress
  updated styling
  web socket configuration in progress
  Updated web socket support to spring 4.0
  Solved ENCUESTAME-642
  Migrated to Spring 4.0.RELEASE
  Fixed error
  Cleaning java code
  ...
Merge remote-tracking branch 'origin/development'

* origin/development:
  Customised tomcat war file
  Testing second conf with travis-ci
  Updated travis configuration
  New submodule dojo-war Improved tomcat overlays Updated maven war plugin version
Merge pull request #3 from encuestame/development

Development
Merge remote-tracking branch 'origin/development'

* origin/development: (23 commits)
  Updated readme logo
  Workarounds to fix mobile and tablet styling issues Added missing mobile views Improved error pages bugfixes
  Fixed nullpointerexeption on vote, added default values on boolean bean properties
  Profile mobile styling
  New Graph widgets Added mobile support into the current hashtag graph New Search stats widget Mobile styling bugfixes
  Mobile  improvements, styling issues, performance
  Updated messages, social networks in installation wizard view
  logger set as warn as default
  Fixed setup wizard installation Added finish welcome view on finish wizard installation ENCUESTAME-286 Added new logos
  Fixed issue on jsp install wizard
  Update mysql installation script.
  Search poll service has been completed.
  Updated the new Poll and survey property.
  Updated poll domain with createDate instead createAt Search Filters connected to poll json search service
  Moderated labels
  Added comment length text by configuration
  Encuestame debug mode view
  Working in search && question view
  Added leaflet map support css bugfixes
  Added leaflet map support
  ...
Merge pull request #4 from encuestame/development

Development
Merge pull request #5 from encuestame/development

Development
[bamboo] Automated branch merge (from master:442b76a6a8107c04408d8d6addb6b3ba8682b364)