Test shit
Merge branch 'master' of https://github.com/haakondw/toppurapp

Conflicts:
	src/com/ntnu/eit/PatientActivity.java
	src/com/ntnu/eit/pasients/model/PatientsListAdapter.java
 + Fixed merge conflict