Unit tests in progress for XmlRocketRepository.java
Merge branch 'master' of https://github.com/jahales/BIRD

Conflicts:
	src/controllers/Main.java