add 5.11-5.16 project plan
1.modified Excel2Html.java to ExcelToHtml.java
2.moditied Word2Html.java to WordToHtml.java
3.remove cameraToPdf
4.improve exception handle in WordToHtml.java and ExcelToHtml.java
5.add TextReaderActivity for show text file
6.fix chinese show problem
7.add word excel txt file show to application
Merge branch 'master' of https://github.com/TopLittelbob/AndroidReader
untracked some files
untracked some files
1.add some ui activity
2.add screen caputer function
3.add iamge to pdf preview function
4.add text reader
Merge branch 'master' of https://github.com/GitManager/AndroidReader into ht

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/classes/team/top/activity/MainActivity.class
	bin/classes/team/top/activity/R$id.class
	bin/classes/team/top/activity/R$layout.class
	bin/classes/team/top/activity/R$string.class
	bin/classes/team/top/activity/R$style.class
	gen/team/top/activity/R.java
	src/team/top/Camera/cameraToPdf.java
	src/team/top/activity/TestContentActivity.java

merged work
Merge pull request #7 from TopLittelbob/master

pull the last version 201305161707