element
Merge branch 'master' of github.com:muchenshou/HorseReader

Conflicts:
	youyou/src/com/reader/book/TextArea.java
	youyou/src/com/reader/book/manager/PageProvider.java
	youyou/src/com/reader/book/model/BookModel.java
	youyou/src/com/reader/book/model/MarkupElement.java
	youyou/src/com/reader/book/model/ParagraphElement.java