stripos added
local confg
two local files I dont want to commit
Merge branch 'master' of https://github.com/herrwalter/SeleniumShell

Conflicts:
	core/config/config.ini
	nbproject/project.properties