Merge branch 'release/0.3' into develop
Merge branch 'master' into develop
Integrate parser settings to bootstrap-wysihtml5
Bump version to 0.3.1
Merge branch 'release/0.3.1'