* Chase latest update from kcwu
Merge branch 'master' of github.com:audreyt/moedict-webkit

Conflicts:
	main.js
	main.ls