setting up test project
Merge branch 'master' of github.com:Panum/sw804f13

Conflicts:
	development/Android/Redirect/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
	development/Android/Redirect/target/surefire-reports/TEST-dk.aau.cs.redirect.redirectTest.xml
	development/Android/Redirect/target/surefire-reports/dk.aau.cs.redirect.redirectTest.txt