Merge remote-tracking branch 'origin/die-feature'

Conflicts:
	testGIT/forms/form1.js
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/scm-course-20140403/svy-training.git
fixed error