update from server@master.eng
remove BAK images
update .gitignore rule and new files of .git-ftp.ignore
update from server@master.eng
update from server@jap
Merge branch 'master.eng' into jap

Conflicts:
	images/eng_back.jpg
	images/icon03.jpg
	images/icon04.jpg