Merged framework and bumped PHP version number
file cleanup