,
Merge branch 'Linksatmah' of https://github.com/isaklilja/version1.git
into Linksatmah

Conflicts:
	res/layout/link_list_item.xml