Fixed path to included files to be relative to APP_PATH
Merge branch 'v1.0' into develop
Merge branch 'develop'