Cleaned project and updated build tools
Merge pull request #1 from battlex2010/master

Cleaned project and updated build tools