added custom taxonomy and controller for custom taxonomy for json api
tweaked custom taxonomy function slightly
added fix for returning posts in children terms
added skcat.php template
Merge commit 'grassy-knoll.r01' into integration
finished script for importing taxonomies
testing taxonomy import
fixing register origin issue
Merge commit 'sso.r01.dc' into integration
Completed products taxonomy importer.
Merge commit 'products_taxonomy.r03.dc' into integration
added sso_options class
Merge commit 'grassy-knoll.r02' into integration
Changes to login and reg pages
Merge commit 'grassy-knoll.r03' into integration
Merge commit 'grassy-knoll.r04' into integration
completion of SSO login/reg using POST instead of GET
Merge commit 'grassy-knoll.r05' into integration
Merge commit 'grassy-knoll.r06' into integration
Merge commit 'sso.r02.dc' into integration