bn
Merge branch 'master' of https://github.com/kalifousHome/plugins.git

Conflicts:
	.classpath