* commit 'd7d6e709401859f78526ced843f605008ef80fc6':
add links from the use cases list to the actuall use case
remove todo states
add german language to the document
change the "Artikel erfassen" erfassen
change the use case tables to footnotesize and longtable environment
add two additional use cases
add description about the detailed use cases
add some use cases
change the placement of the test cases table
correct section titles
add citations which where used to create the models
rephrase section title
remove the settings model from the documentation
correct some positions of figures
correct the picture paths
correct some typos
escape an underscore
update bibliography
update the apache configuration in the ansible role
* commit '5f2f1098a479a77c0c7c7818fb8df5f30f2414f2':
remove delete option from inline images
correct the empty message on the index page
rephrase a second message
rephrase the message on empty categories
remove the delete option from the picture model
allow dupilcated names of pictures
add a check to limit picture uploads
add a description field to the Option model
prevent options from deletion und don't allow new options
remove the Setting model
allow pictures to be added on the article
readd pictures to the article details page
fix the url of the django book
remove a todo tag
add the currencies refresh cronjob to the ansible role
* master:
remove delete option from inline images
correct the empty message on the index page
rephrase a second message
rephrase the message on empty categories
remove the delete option from the picture model
allow dupilcated names of pictures
add a check to limit picture uploads
add a description field to the Option model
prevent options from deletion und don't allow new options
remove the Setting model
allow pictures to be added on the article
readd pictures to the article details page
fix the url of the django book
remove a todo tag
add the currencies refresh cronjob to the ansible role
Andreas Zweili
Ivan Hörler