Merge branch 'master' of github.com:lxark/lxOAuthPlugin

Conflicts:
	.gitignore