Merge branch 'master' of https://github.com/gachoyi/JavaApplication1

Conflicts:
	nbproject/private/private.xml
1105.2233