Spasmi
Merge branch 'master' of https://github.com/luctogno/hackMed

Conflicts:
	src/main/java/net/tinvention/server/businessLayer/DataManager.java