Merge branch 'hotfix' of github.com:alohaeditor/Aloha-Editor into release
Removed output files for guides
Added output folder to gitignore
floating of characterpicker #gcn-51248
specialchar overlay now floats with the menu... except IE7 right now...
specialchar popup now follows the floating menu
Added changelog entry for changes

Conflicts:

	build/hotfix-changelog.md
fixes #806 -- characterpicker styling
Removed trailing comma in the define list of the characterpicker-plugin
Fixes potential bug causing '/' in attribute names
Fixes potential bug causing [/>] in attribute values
Merge branch 'release' of github.com:alohaeditor/Aloha-Editor into hotfix
Merge branch 'hotfix' of github.com:alohaeditor/Aloha-Editor into dev

Conflicts:
	doc/guides/output/images/MultiSplitButton.png
	doc/guides/output/images/book_icon.gif
	doc/guides/output/images/chapters_icon.gif
	doc/guides/output/images/check_bullet.gif
	doc/guides/output/images/construction.png
	doc/guides/output/images/credits/haymo.jpg
	doc/guides/output/images/credits/hlubek.jpg
	doc/guides/output/images/credits/nka.jpg
	doc/guides/output/images/credits/rene_kapusta.jpg
	doc/guides/output/images/credits/skurfuerst.jpg
	doc/guides/output/images/credits_pic_blank.gif
	doc/guides/output/images/development_guide/Color-schema.png
	doc/guides/output/images/edge_badge.png
	doc/guides/output/images/editor_guide/Floatingmenu-multisplit.png
	doc/guides/output/images/editor_guide/Floatingmenu.png
	doc/guides/output/images/feature_tile.gif
	doc/guides/output/images/footer/facebook.png
	doc/guides/output/images/footer/google.png
	doc/guides/output/images/footer/html5_tech.png
	doc/guides/output/images/footer/logo.png
	doc/guides/output/images/footer/top.png
	doc/guides/output/images/footer/twitter.png
	doc/guides/output/images/footer_tile.gif
	doc/guides/output/images/grey_bullet.gif
	doc/guides/output/images/header/glow.png
	doc/guides/output/images/header/logo.png
	doc/guides/output/images/header/pixels.png
	doc/guides/output/images/header/search.png
	doc/guides/output/images/header_backdrop.png
	doc/guides/output/images/header_tile.gif
	doc/guides/output/images/icons/callouts/1.png
	doc/guides/output/images/icons/callouts/10.png
	doc/guides/output/images/icons/callouts/11.png
	doc/guides/output/images/icons/callouts/12.png
	doc/guides/output/images/icons/callouts/13.png
	doc/guides/output/images/icons/callouts/14.png
	doc/guides/output/images/icons/callouts/15.png
	doc/guides/output/images/icons/callouts/2.png
	doc/guides/output/images/icons/callouts/3.png
	doc/guides/output/images/icons/callouts/4.png
	doc/guides/output/images/icons/callouts/5.png
	doc/guides/output/images/icons/callouts/6.png
	doc/guides/output/images/icons/callouts/7.png
	doc/guides/output/images/icons/callouts/8.png
	doc/guides/output/images/icons/callouts/9.png
	doc/guides/output/images/icons/caution.png
	doc/guides/output/images/icons/example.png
	doc/guides/output/images/icons/home.png
	doc/guides/output/images/icons/important.png
	doc/guides/output/images/icons/next.png
	doc/guides/output/images/icons/note.png
	doc/guides/output/images/icons/prev.png
	doc/guides/output/images/icons/tip.png
	doc/guides/output/images/icons/up.png
	doc/guides/output/images/icons/warning.png
	doc/guides/output/images/nav_arrow.gif
	doc/guides/output/images/plugins/cite-01.png
	doc/guides/output/images/plugins/cite-02.png
	doc/guides/output/images/plugins/formatlesspaste-01.png
	doc/guides/output/images/plugins/formatlesspaste-02.png
	doc/guides/output/images/plugins/headerids-01.png
	doc/guides/output/images/plugins/linkbrowser-01.png
	doc/guides/output/images/plugins/metaview-01.png
	doc/guides/output/images/plugins/metaview-02.png
	doc/guides/output/images/plugins/numerated-headers-01.png
	doc/guides/output/images/plugins/numerated-headers-02.png
	doc/guides/output/images/plugins/wai-lang-add-annotation.png
	doc/guides/output/images/plugins/wai-lang-code.png
	doc/guides/output/images/plugins/wai-lang-select.png
	doc/guides/output/images/strobe/chapters.png
	doc/guides/output/images/strobe/check.png
	doc/guides/output/images/strobe/code.png
	doc/guides/output/images/strobe/containergradient.png
	doc/guides/output/images/strobe/contribute.png
	doc/guides/output/images/strobe/credits.png
	doc/guides/output/images/strobe/dude.png
	doc/guides/output/images/strobe/guide-button.png
	doc/guides/output/images/strobe/guidegradient.png
	doc/guides/output/images/strobe/guides.png
	doc/guides/output/images/strobe/notes.png
	doc/guides/output/images/strobe/paperandpencil.png
	doc/guides/output/images/strobe/pin.png
	doc/guides/output/images/strobe/sidebar-gradient.png
	doc/guides/output/images/strobe/starperson.png
	doc/guides/output/images/strobe/tab-code.png
	doc/guides/output/images/strobe/tab-notes.png
	doc/guides/output/images/strobe/tab-pin.png
	doc/guides/output/images/strobe/tab-warning.png
	doc/guides/output/images/strobe/warning.png
	doc/guides/output/images/tab_grey.gif
	doc/guides/output/images/tab_info.gif
	doc/guides/output/images/tab_note.gif
	doc/guides/output/images/tab_red.gif
	doc/guides/output/images/tab_yellow.gif
	doc/guides/output/images/tab_yellow.png
	doc/guides/output/images/toolbar.png
Merge branch 'dev' of github.com:alohaeditor/Aloha-Editor into dev