Merge branch 'release/v1.2'
Merge branch 'release/v1.2b'
Merge branch 'develop' of github.com:Michieljoris/roster into develop
Added color picker to person editor
V0.1.3
Merge branch 'release/v0.1.3'
Merge branch 'release/v0.1.3' into develop
Updated manifest
Merge branch 'release/v0.1.3b'
now then..
updated manifest!!!
Merge branch 'release/v0.1.3c'
added proper html server