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

Conflicts:
	images/icon03.jpg
	images/menu_bg.jpg