weekends work
Merge branch 'master' of https://github.com/chuej/namesake

Conflicts:
	Resources/book/namesake.js
	Resources/ui/main/webview/WebView.js
message