fix merge conflicts
remove two-way-gridview module

This is included in the main Serenity application.  This may be replace
by the twoway-view project in the future.