Merge branch 'release_2013_04_17'
Completing feature e
Merge remote-tracking branch 'origin/development' into feature_1
feature_1: added new files
Merge branch 'feature_e' into development

Conflicts:
	app1/file1.txt