Merge branch 'master' into contraintWork

lib/dao-factory.js

@@ -184,8 +184,6 @@ module.exports = (function() {
       return self._hasReadOnlyAttributes && self._readOnlyAttributes.indexOf(key) !== -1
       return self._hasReadOnlyAttributes && self._readOnlyAttributes.indexOf(key) !== -1
     })
     })
 
 
-    this.DAO.prototype.rawAttributes = this.rawAttributes;
-
     if (this.options.instanceMethods) {
     if (this.options.instanceMethods) {
       Utils._.each(this.options.instanceMethods, function(fct, name) {
       Utils._.each(this.options.instanceMethods, function(fct, name) {
         self.DAO.prototype[name] = fct
         self.DAO.prototype[name] = fct
@@ -291,6 +289,8 @@ module.exports = (function() {
     this.DAO.prototype._hasCustomSetters = Object.keys(this.DAO.prototype._customSetters).length
     this.DAO.prototype._hasCustomSetters = Object.keys(this.DAO.prototype._customSetters).length
 
 
     Object.defineProperties(this.DAO.prototype, attributeManipulation)
     Object.defineProperties(this.DAO.prototype, attributeManipulation)
+
+    this.DAO.prototype.rawAttributes = this.rawAttributes;
     this.DAO.prototype.attributes = Object.keys(this.DAO.prototype.rawAttributes)
     this.DAO.prototype.attributes = Object.keys(this.DAO.prototype.rawAttributes)
     this.DAO.prototype._isAttribute = Utils._.memoize(function (key) {
     this.DAO.prototype._isAttribute = Utils._.memoize(function (key) {
       return self.DAO.prototype.attributes.indexOf(key) !== -1
       return self.DAO.prototype.attributes.indexOf(key) !== -1