Merge branch 'release/1.0.4' into develop
styles
better week calculation
bumped version numbers
Merge branch 'release/1.1.0'