[2014-12-22] Module DAO
Merge remote-tracking branch 'origin/master'