Merge tag 'release-2013-04-03.1' into dev

releasing first feature
adding feature 1
adding feature 2
Merge branch 'feature1' into dev
merging feature2 into dev
fixed feature 1
Merge branch 'feature1' into dev
fixed feature 2
merging dev into branch before commit
Merge branch 'feature2' into dev
Merge branch 'release'