Merge branch 'MAID-354' into MAID-354_maidsafeTask

Conflicts:
	pom.xml
	src/main/java/org/jenkinsci/plugins/MaidSafe_CI/maidsafeRepository.java
	src/main/java/org/jenkinsci/plugins/MaidSafe_CI/maidsafeTask.java