wip
Merge branch 'master' into wp-blog
migrated wp
removed exported files
renamed file