Removed Many-To-Many bi-directional helpers because they cause
performance issues.
Updated Version 3.1.5
Merge branch 'master' into develop

Conflicts:
	version.txt