Merge branch 'lee'
add .buildpath to .gitignore
Merge branch 'lee'
rm .buildpath