Partial commit
Implemented story 15
Fixed ickeregistrerade tider
Fixed Marge conflicts
Merge pull request #104 from buren/task_15

Task 15
Implementerade 16
Implementerade 16
Merge pull request #105 from buren/16

Implemented Story 16
Story 17
Fixed merge conflicts
Merge pull request #106 from buren/Story17

Story17
Story 18
Part Story 18
Merge branch 'java1_6' of github.com:buren/enduro into java1_6

mRGEx