Merge branch 'feature-search' into feature-client-side
all xhtml templates and assets
flow updates
flow updates
Merge branch 'feature-client-side' of github.com:atyagi/SurgeryAssist into feature-client-side

Conflicts:
	src/main/webapp/WEB-INF/flows/registration/register.xhtml