fixed framework paths
Merge commit 'ea4b2' into develop