* nope
Merge remote-tracking branch 'origin/master'

Conflicts:
	plugin_lk.py
* research