Merge branch 'hotfix/0.1.1' into develop
Merge branch 'hotfix/0.1.2' into develop
Upgrade to Bootstrap 3.0.3 and change layout
Merge branch 'release/0.2.0'