CS fixes

- Updated all docblocks to current coding standards
- Ensured all files have at least a file-level docblock
Update copyright year to 2013
Fix merge