updating examples and scripts
Merge branch 'master' of github.com:eolivi/openmeegEOlivi

Conflicts:
	examples/model/cortex_dipoles.txt
	examples/model/cortex_dipoles_small.txt
	examples/model/ecog_electrodes_locations.txt
	examples/model/eeg_channels_locations.txt
	examples/model/head_model.cond
	examples/model/internal_electrodes_locations.txt
	examples/model/meg_channels_locations.squids
	examples/model/sample_output.txt