Adding f5
Merge remote-tracking branch 'origin/master' into feature5

Conflicts:
	README.txt