20131225
Merge branches 'ObjGuide2DB' and 'master'