141201-0218
asd
aa
sa
Merge remote-tracking branch 'origin/PSJ' into KYW

Conflicts:
	Server_Seetreet/src/com/seetreet/dao/MongoDAO.java