Master to develop

Merging master to develop, nu använder ni bara develop...