Merge branch 'release/1.0' into develop
database structure
setting up associated files.
setting up a db workaround.
made the associations working.
Merge branch 'feature/associations' into develop
removed strikethroughs
Merge branch 'release/1.1'