Merge conflicts

diff --cc enyo-client/application/source/views/module_container.js
Simple merge

diff --cc enyo-client/database/source/init_instance.sql
index 98983d8,0515a9b..749349b
--- 1/enyo-client/database/source/init_instance.sql
--- 2/enyo-client/database/source/init_instance.sql
+++ b/enyo-client/database/source/init_instance.sql
@@@ -33,9 -24,7 +33,10 @@@ select xt.js_init()
  \i public/tables/grppriv.sql
  \i public/tables/incdt.sql
  \i public/tables/itemsite.sql;
 +\i public/tables/prj.sql
 +\i public/tables/prjtask.sql
 +\i public/tables/ophead.sql
+ \i public/tables/metric.sql;
  \i public/tables/quitem.sql
  \i public/tables/todoitem.sql
  \i public/tables/usrpriv.sql

diff --cc lib/enyo-x/source/views/module_container.js
Simple merge

diff --cc package.json
Simple merge