Finish Feature-1
Merged 'develop'.

Conflicts:
	f3_only.txt