removed ignoreLock
ja weil halt
Merge branch 'master' of github.com:murphy2/sourceBox

Conflicts:
	sourcebox-client/sb_client.conf