added buildpath and project files for easier switching branches in eclipse
Merge branch 'dev'