Merge tag '0.5.1' into develop

0.5.1
apply new design using bootstrap
bump the version number to 0.6.0
Merge branch 'release/0.6.0'