Merge branch 'release_2013_04_17'
Completing feature f
Merge branch 'feature_f' into development
Adding test script
Merge branch 'test_script' into development
Merge branch 'development' into feature_a
feature_a:added a file
Merge branch 'feature_a' into development
feature_e:fixed merge conflicts