Formatted indentation
Deleted some auto-generated comments
Indentation of some comments
Removed php end tags in test classes
Merge branch 'feature/remove-php-end-tags' into develop