Merge branch 'master' into manu_branch
ignore src/main/resources/database.properties
move jsp to UEL synthax bean.properties
merge my local changes with the refactoring from Bergsocke
Merge pull request #24 from HackerPartie/manu_branch

Manu branch