Use AppleDoc-compatible comment formatting
Copyright 2013
More 2013s
Remove trailing tabs
Merge branch 'feature/appledoc-compatible' into develop
Merge branch 'release/1.1'