issue #8 - Create, read, edit and delete Building
issue #8 - Create, read, edit and delete Building. Conflicts solved.
issue #8 - Create, read, edit and delete Building. Conflicts solved.
Merge origin/master

Conflicts:
	fishe-web/src/main/resources/org/fishe/db/mysql.sql
	fishe-web/src/main/resources/org/fishe/web/bundle/Resources.properties
	fishe-web/src/main/resources/org/fishe/web/bundle/Resources_fr.properties
	fishe-web/src/main/webapp/layout.xhtml