Merge branch 'dev'
It's 2014.
Merge pull request #529 from maxsnew/2014

Update to 2014
Merge branch 'dev'
Merge branch 'master' into dev