form add faq category final
Add functions
Merge commit '0922b9b'

Conflicts:
	packages/com_faq/script.php