[2014-11-07] Resolved conflict AppBiz