clear installation proccess
generate proxies on installation
fix some merging issues
Merge remote-tracking branch 'pawel/merge_master_v4.1_with_new_plugins'