moop
Merge branch 'master' of https://github.com/MathiasBrandt/spcl-e2014-project

Conflicts:
	android/Pervasive/app/src/main/java/dk/itu/pervasive/common/WebAppInterface.java