Add layouts and activity
Merge branch 'feature/add_goats_displaying' into develop

Conflicts:
	res/values/strings.xml