Prepare touch version for rewriting the UI (everything will be changed back later but it is helpful for having a stable and a development version installed in parallel)

git-svn-id: http://cantata.googlecode.com/svn/trunk@5265 b1e49159-3266-923f-9c3e-04f16369770a
First steps towards convergence

git-svn-id: http://cantata.googlecode.com/svn/trunk@5266 b1e49159-3266-923f-9c3e-04f16369770a