Merged master into develop with updated website