Jenkins
Jenkins
Fixing
Merge branch 'master' of github.com:Panum/sw804f13

Conflicts:
	development/Android/redirect/tests/ant.properties
	development/Android/redirect/tests/proguard-project.txt