Merge branch 'release_2013_04_17'
Completing feature e
Merge branch 'development' into feature_a
feature_a:added a file
Merge branch 'feature_a' into development
Merge remote branch 'world/development' into development
feature_e:fixed merge conflicts
Merge branch 'feature_e' into development
Revert "Merge branch 'feature_f' into development"

This reverts commit 5a442e7a599fb4c5109a90c6e48e92245b504555, reversing
changes made to 7ae67830cf9d4788896d80fb5f2ad5621283759f.

Conflicts:

	app1/file1.txt
Revert "Revert "Merge branch 'feature_f' into development""

This reverts commit 6718413dd88fbee5928228737977c747bf878743.
feature_f
Merge branch 'feature_f' into development
development