141113_sjpark_commit
Merge branch 'sjpark_141113_backup' into 141113_jwlim

Conflicts:
	Server_Seetreet/build/classes/com/seetreet/dao/MongoDAO.class
	Server_Seetreet/build/classes/com/seetreet/dao/MongoDB.class