added mail-class for easily sending mails
updated mail-class to support html-mails
removed fenc-marker from vim-lines
Conflicts:

	www/framework/cms/cms_edit.php
	www/framework/cms/tpl/jstree.tpl
	www/framework/cms/tpl/projectmain.tpl
	www/framework/cms/ui_main.php
replaced iconv-string with mb-string functions (less dependencies)
mail: extended stripTags
depage-magaziner: fixed double submissions per push-state
depage-magaziner: fixed bug in IE
depage-magaziner: added informing piwik after page change
depage-live-filter: removed console.log when already initialized
depage-magaziner: disabled magazine when history.js is not enabled
depage-magaziner: fixed bug for IE with line with empty hrefs pointing to current page
depage-social: fixed bug with newer versions of jquery
depage-magaziner: fixed small issues (jshint)/fixed piwik tracking
depage-magaziner: deferred resize event
depage-magaziner: fixed loading for pages with relative urls
depage-slideshow: enhanced slideshow

- added resume function
- changed fadeout-function to hide images after fading out
depage-slideshow: enhanced slideshow with css3-transitions

- added css3-transition instead of jquery-animation where available
- added example file
depage-slideshow: added example with slideshow-controller
enhanced slideshow example
Merge commit '082f7e36405f01566b40147bb0c4d3ee03f7c050'

Conflicts:
	abstracts/input.php