some merge and usage initial
Merge branch 'master' into customizeAtStartup
Merge branch 'master' into customizeAtStartup

Conflicts:
	.consulo/runConfigurations/Consulo.xml
	platform/platform-api/src/com/intellij/ui/border/CustomLineBorder.java
fixed #54