Feature/clang compile fixes

Jan Delemberrequested to merge
feature/ClangCompileFixes into develop

Fixed some compile errors and warnings when building with clang 3.8

Merge request reports