#12 new autolinker library
#12 remove data element
Merge pull request #31 from socia-platform/12_autolinker

12 autolinker
Merge branch 'master' into 26_NotificationRefactoring

Conflicts:
	app/assets/javascripts/htwplus.js