p
Merge branch 'PSJ2' into LJU

Conflicts:
	Server_Seetreet/build/classes/com/seetreet/dao/MongoDAO.class
	Server_Seetreet/build/classes/com/seetreet/util/C.class
	Server_Seetreet/src/com/seetreet/dao/MongoDAO.java
cc