A lot of changes, mostly serialization. Doesn't work properly yet.
Merge branch 'master' of https://github.com/ithillel/Legion.git

Conflicts:
	Legion/src/org/hillel/it/legion/model/entity/BaseEntity.java
	Legion/src/org/hillel/it/legion/model/entity/User.java