add pydevproject to gitignore
Merge remote-tracking branch 'upstream/master'
Merge branch 'dotcloud'
add legend to checkboxes
move files