Merge branch 'release/2013-08.02' into develop
replaces bbcode underline tag with spoiler tag
unified bbcode buttons for image and media
inline modernizr called and removed it
refactores MarkitUpEditorHelper
refactors file uploader client
prevents double rendering of newUpload view on init
fixes #150 Upload not working in iCab Mobile
Merge branch 'feature/image-upload-iframes' into develop
improved spoiler tag
bumped version string
improved spoiler tag
improved spoiler tag
Revert "improved spoiler tag"

This reverts commit 1778d45cfe163fe076e7ce8776d76dbdc9f0f729.

CSS background doesn't behave nice in shoutbox on linebreaks
updates CakePHP to 2.4.0
updates i10n
detect image links that have content appended `?` and `/`
bumped version string
code comment
removes old markItUp callback implementation