Adding posttypes options
Fix merge conficts
Add option to enable/disable post types
Merge branch 'posttypes' into dev
Update localization
Merge pull request #5 from flymke/dev

Dev