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

Conflicts:
	plugins/UCT2015Producer.cc
Fixed indent
Automatic indenting does not work. Back to the original.
Merge pull request #30 from mcepeda/master

Electron Iso Jet --> 12x12