dead - 141029 
1. join artist
2. join provider
3. work reply
4. artist search content
1410291245_commit
asd
asd
Merge branch 'sjpark_141029' into merged-1249

Conflicts:
	Server_Seetreet/src/com/seetreet/controller/WebPageController.java
	Server_Seetreet/src/com/seetreet/dao/MongoDAO.java
commit_141104
youngwook-141105
141105_commit
Merge remote-tracking branch 'origin/youngwook-141105' into
sjpark-141105

Conflicts:
	Server_Seetreet/src/com/seetreet/controller/ContentProviderController.java
	Server_Seetreet/src/com/seetreet/dao/MongoDAO.java
	Server_Seetreet/src/com/seetreet/util/C.java
need to merge_1106
rrr
Merge remote-tracking branch 'origin/141106_sjpark' into merged_141105

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