Standardization of screens and final user interface design.
Merge branch 'master' of https://github.com/fishe/fishe

Conflicts:
	fishe-web/src/main/webapp/index.xhtml
	fishe-web/src/main/webapp/layout.xhtml