asd
Merge branch 'master' of https://github.com/Insane111090/NetBeansProjects

Conflicts:
	OracleNoSQLConverter/nbproject/private/private.properties