Merge branch 'release/2013-01.04' into develop
fix markItUp touch problem on iOS
bumped version string
Merge branch 'release/2013-01.05'