Story 13, acceptanstest engelska ->svenska
Fix mergeconflicts
Merge branch 'master' of github.com:buren/enduro into Story13
Merge pull request #99 from buren/Story13

Story13
Fixat releasescript
Fixat, nu kommer hela javadoc med
Merge pull request #101 from buren/Release_script

Release script
Java 1.6 Compliant
Merge pull request #103 from buren/Java6_fix

Java 1.6 Compliant
Fixed ickeregistrerade tider
Implementerade 16