Merge pull request #1 from Eldinnie/develop

Develop->master
Delete .pydevproject
Delete .project
Merge pull request #2 from Eldinnie/master

sf