integrated if module in htaccess
Merge branch 'integration'

Conflicts:
	.htaccess