webview
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/flatsoft/base/MainFragment.java
	app/src/main/java/com/flatsoft/base/views/RichTextEditor.java
html