Reorganization of features and design improvements.
Merged and solved conflits with @evase and @leymouna.
Merge branch 'master' of https://github.com/fishe/fishe

Conflicts:
	fishe-web/src/main/resources/org/fishe/web/bundle/Resources.properties
	fishe-web/src/main/resources/org/fishe/web/bundle/Resources_fr.properties