update copyright to 2013 and split address into two lines
Merge branch 'development' into staging
Merge branch 'staging'