Add .gitignore
update to svn1228
Merge branch 'master' into lua-interface