Changes to electron iso 12x12
Merge branch 'master' of https://github.com/uwcms/UCT2015

Conflicts:
	plugins/UCT2015Producer.cc