Merge branch 'release_2013_04_17'
Completing feature e
Merge remote-tracking branch 'origin/development' into feature_1
Add app4.
Merge branch 'feature_1' into development
Merge branch 'feature_e' into development

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

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

Conflicts:

	app1/file1.txt