Changed github references
Merge branch 'development' into integration