svn merge http://svn.a.com/branches/20150129_168954_sales-impr_1
svn resolve --accept working web/src/main/webapp/templates/layout/default_layout.vm
