Wiki docs #512

As per #512 this is to update develop with all the changes made in wiki-docs branch.