updated to scala 2.11
Merge remote-tracking branch 'origin/master'

Conflicts:
	build.sbt
	src/com/douban/base/DoubanActivity.scala
	src/com/douban/book/AddNoteActivity.scala
	src/com/douban/book/BookActivity.scala
Merge remote-tracking branch 'origin/master'

Conflicts:
	build.sbt
	src/com/douban/base/DoubanActivity.scala
	src/com/douban/book/AddNoteActivity.scala
	src/com/douban/book/BookActivity.scala