year in copyrights: 2013 => 2014
Merge branch 'master' into beta