Merge branch 'isaklilja-links_final' into sixth_iteration

Merged isaklilja-links_final with origin.
Merge branch 'sixth_iteration' of https://github.com/MahApp/version1.git
into isak