FlatPage is one content type (Article)
Update initial migration on flatpage
Add channel field on FlatPage Admin
add flatpage modify on CHANGELOG
Merge branch 'master' of github.com:opps/opps

Conflicts:
	CHANGELOG.md