Merge branch 'master' of github.com:catami/catami

Conflicts:
	features/models.py
Merge github.com:catami/catami