userena changes
Merge github.com:catami/catami
Removing haystack requirements
Merge github.com:catami/catami