new modules
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitmodules
Grep plugin