Possible fix for not being able to include from api_application
Merge branch 'sibbo'
Fixed #1