Merge branch 'master' into manu_branch
Merge pull request #22 from HackerPartie/eva_branch

Eva branch
Merge pull request #23 from HackerPartie/eva_branch

Database -und Testpackage umbenannt, Methodennamen verkürzt
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
Remove hardcoded database name sentence_database

We want to sort different kind of stuff ...
Merge pull request #25 from HackerPartie/master

Merge pull request #24 from HackerPartie/manu_branch
the modified gitignore
Merge pull request #26 from HackerPartie/jens_little_box

the modified gitignore
Remove hardcoded database name sentence_database

We want to sort different kind of stuff ...
move database setup to postgresql synthax
Load of stuffs:

  * Add postgresql to pom.xml
  * Rename Object property to Subject in Sentence Model
  * Rename table to sentence_svc ( subject verb complement) in case we want to exapnd to other sentences model
Add link to wiki
Merge conflict resolution
Merge pull request #27 from HackerPartie/manu_branch

Manu branch
authentication
Merge pull request #28 from HackerPartie/jens_bib_box

authentication
no null today