Merge branch 'cli_context_menu' into local_develop

Conflicts:
	xbmcswift2/plugin.py
Merge branch 'cli-keyboard' into local_develop