Merged input filters and WYSIWYG features and moved feature activation from dependencies to the correct function.
Merge remote-tracking branch 'origin/InstallProfile' into InstallProfile

Conflicts:
	profiles/master_install/master_install.profile