Merge branch 'release/2013-04.07' into develop
unbumped version string
code refactoring
removed <br /> whitespace which should better be set by css
updated CakePHP to 2.3.4
bumped version string
Merge branch 'release/2013-04.08'