Initial commit for 2.0
All code updates and changes needed for Fatty to work in PHP 5.4 and nicely.
Removed commented code
Merge branch 'feature/2.0' into develop
Removed old code from develop branch