Update assembly
Use global conf path
Del patch classes
Merge branch 'dev'