unset the DISPLAY variable at startup
Some conditionals in the JSP template
Merge branch 'master' of https://github.com/jlopezr/jease-marea-site