Merge in master
Fight with git
Fix css custom file