Initial commit from server
Without Zend
Fixed merge conflicts.