Data model and metadata table improved and updated.
Merge branch 'master' of http://github.com/qgep/QGEP