1
Merge branch 'master' of https://github.com/itmins/doby

Conflicts:
	SERVER/WebRoot/WEB-INF/classes/net/itmins/doby/api/service/DobyDoubanService.class
	SERVER/WebRoot/WEB-INF/classes/net/itmins/doby/api/util/Test.class
	SERVER/src/net/itmins/doby/api/util/Test.java