commit local
commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
	en-README.md
	nbproject/private/private.xml
back to old
Revert "back to old"

This reverts commit 41ffd12ef7472c15e492bf9a4b8aeaf1a2e14837.
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
	en-README.md
	nbproject/private/private.properties
	nbproject/private/private.xml