change of merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	templete from NSSCHOICES.php
Merge branch 'master' of https://github.com/tsztoyip/SDGTempQ