test
Merge branch 'master' of https://github.com/HackerPartie/boulevard
Merge branch 'master' of https://github.com/HackerPartie/boulevard into eva_branch
Merge pull request #31 from HackerPartie/manu_branch

Manu branch
navbar bottom
Merge pull request #32 from HackerPartie/jens_big_box

navbar bottom
Merge branch 'master' of https://github.com/HackerPartie/boulevard into eva_branch
Merge pull request #33 from HackerPartie/eva_branch

Eva branch
Oesterreich ist-ur.org hinzugefuegt
Merge pull request #34 from HackerPartie/eva_branch

Oesterreich ist-ur.org hinzugefuegt
Spielerei mit den Schriftarten
Merge pull request #35 from HackerPartie/eva_branch

Spielerei mit den Schriftarten
Update Layout
Merge pull request #36 from HackerPartie/eva_branch

Update Layout
Refactor URL to following pattern:

/random for random sentence
/add for add formular
/listall list all the original sentences already entered
Merge branch 'master' into manu_branch

Conflicts:
	src/main/webapp/index.jsp