Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/home/ncapp/NOODBInitial.java
	src/com/home/ncapp/NOOParameter.java
Merge branch 'master' of https://github.com/mulyonorafianto/NCApp

Conflicts:
	src/com/home/ncapp/NOODBInitial.java
	src/com/home/ncapp/NOOParameter.java