Merge branch 'release_2013_04_17'
Merge branch 'development' into feature_a
feature_a:added a file
Merge branch 'feature_a' into development