up-button now works correctly (at least until we add more views to the hierarchy)
Merge branch 'master' of https://github.com/fruktstav/demokratinu

Conflicts:
	demokratinu.src/src/org/group13/pocketpolitics/view/CommitteeProposalListAdapter.java