copyright 2014 edit
Merge branch 'development' into staging