merge in development WIP:
"Merge pull request #113 from jaeggerr/development"
fix compile
Merge commit '4778ccb37a6660cb24926e4b79aaa121e146b4dd' into feature/resources