Add associations to versioning

(cherry picked from commit 994bf37dc9d9850606ecb5f52bba90023592c56f)

Conflicts:
	.gitignore
Merge branch 'master' into gh-pages

Conflicts:
	.gitignore