Merge branch 'release/release2'
Merge branch 'release/20130806_feature3'
Merge branch 'hotfix/hotfix1' into develop
hotfix 2
Merge branch 'hotfix/hotfix2' into develop
release hotfix2