Merge pull request #4 from woothemes/master

update fork
removed legacy code
coding standards
Merge pull request #2805 from andreibarabas/master

Improve Merge #2767