Merge remote-tracking branch 'origin/LJU' into KYW
Merge remote-tracking branch 'origin/LJU' into KYW
gogogo
141129_159
Merge remote-tracking branch 'origin/KYW' into LJU

Conflicts:
	Server_Seetreet/src/com/seetreet/controller/JoinController.java
	Server_Seetreet/src/com/seetreet/dao/MongoDAO.java
1129_backup
LJU_1129_1545