Fixes for GEB-355 and GEB-356

GEB-355 required GEB-356 to be fixed hence made changes for both.

GEB-355 - Navigator click method should support passing page instances
GEB-356 - Template definitions should support passing page instances along with Page classes.