Khanh Edit Call
Merge origin/master into temp

Conflicts:
	nbproject/project.properties
Hung: version 7:02PM 19:12