Publisher free mode ready
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	nbproject/private/private.xml
Merge branch 'master' of https://github.com/vim-bogota2/ix

Conflicts:
	.gitignore
	nbproject/private/private.properties
	nbproject/private/private.xml