20140610 database
Merge branch 'master' of https://github.com/guozhgang/portal.git
database