fix include
Merge remote-tracking branch 'origin/master'

Conflicts:
	association.php
	view/association.php
phpstorm ignore