Fixed contentprovider
Merge branch 'master' of https://github.com/vonbob/Fall_Prevention_2013

Conflicts:
	FallService/gen/no/ntnu/stud/fallservice/R.java