test
Merge branch 'master' of https://github.com/Niv-Mizzet/bann-pom.git

Conflicts:
	bannpom/scripts/initializedb.py