Update copyright year (2014)
Merge branch 'dev' into gbrick-gh17-redesign-disk-storage