Deleted symlinks from /public and added one (wp) that points to the wordpress directory so we don't have to add symlinks to every folder/file in the wordpress directory.
Updated database.
Merge branch 'subdir' into develop