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

Conflicts:
	FallPrevention/gen/no/ntnu/stud/fallprevention/R.java
Merge branch 'master' of https://github.com/vonbob/Fall_Prevention_2013