phpDoc fix
Merge remote-tracking branch 'origin/master'
Refactored DAO classes to no longer support injecting cacheAdapter through the constructor - now if needed, it can be obtained from serviceLocator.