Changed all classes that should not be extended to final.
Merged 'develop'.