updated core and contrib
Merge pull request #52 from betz/master

update core and contrib