Fixes #25
The option emSmall is now in empahasis.small.
Optionshandling just got easier.
Updated template to reflect changes in the options object.
Merge tag 'v0.2.7' into v0.3.0-wip
Merge branch 'master' into v0.3.0-wip
Merge branch 'master' into v0.3.0-wip
Replaced wysihtml5-0.3 with wysihtml-0.4.x
Changed dependencies in index* files to wysihtml5-0.4. Adapted calls for adding shortcuts to the new api. Does still not work in IE. Maybe using a div instead of an iframe could help.
Using bower version of wysihtml5x-0.4.2
Updated version to reflect wip
Updated tests for new editor
Merge branch 'patch-1' of https://github.com/SixSatori/bootstrap3-wysihtml5-bower into SixSatori-patch-1
Merge branch 'master' into v0.3.0-wip

Conflicts:
	index-dev.html
Merged with master
fixes #39
custom toolbar buttons
Merged v0.2.9
Prepare v0.3.0-alpha.3
Merged readme
fixes #40
Release v0.3.0-alpha3