Merge branch 'master' into sync_electrons

Conflicts:
	setup.sh
Merge branch 'sync_electrons' of ssh://pata/~joosep/Documents/stpol into sync_electrons

Conflicts:
	setup.sh
Merge remote-tracking branch 'cms.hep.kbfi.ee/sync_electrons' into sync_electrons