Guessed some future URLs
Added permanent transmit advertising for custom uni logins
Adjust configuration for ecollab.eu

Renamed artifact to avoid naming conflicts.
Merge remote-tracking branch 'origin/master' into ecollab.eu
Fix XSS vulnerabilities

Added htmlEncode to a parameter in a template missed before.
Merge remote-tracking branch 'origin/master' into ecollab.eu
Migration of touch charts. (#6690, #6691, #6692)
Fix broken build caused by syntax errors introduced in 70341e7
Remove ST Charts from HTML5 manifest
Merge remote-tracking branch 'origin/master' into ecollab.eu

Conflicts:
	src/main/webapp/resources/css/st2-arsnova_new.css
Changed InfoPanel due to newest requirement changes
Changed link in InfoPage
Added MathJax support to presentation mode.
Added MathJax support for question titlebar. Added method to set
titlebar height dynamically.
Replaced Sencha Touch 2.2.1 libs with newer build.
Hotfix for iOS 7 on iPhones
Added Sencha Touch 2.3.0b2 (Beta 2) to libs.
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into ecollab.eu
Updated links