Added time-out to node
Improved Scheduler Node handling
Moved scheduler settings to config file
Updated location for log files and added it to gitignore
Forgot small change to Node
Merge branch 'develop' into imageprocessing

Conflicts:
	code/CCLabCore/src/main/java/com/cclab/core/MasterInstance.java