insert query completed
Merge remote-tracking branch 'origin/master'

Conflicts:
	SourceG2/src/java/DataAccess/DBFunction.java
Merge branch 'master' of https://github.com/datht09/eProjectS4G2

Conflicts:
	SourceG2/src/java/DataAccess/DBFunction.java