add article types
Merge branch 'master' of github.com:sourcefabric/Newscoop into api_article_types

Conflicts:
	newscoop/library/Newscoop/Entity/ArticleType.php
fix some sc
fix redeclaration
Merge pull request #456 from ahilles107/api_article_types

Api article types