NCCApp 20141205.315p

update
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	src/com/home/ncapp/NOOCustoOview.java