Create, read, edit and delete Programmes #4
Create, read, edit and delete Programmes #4
Merge origin/master

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

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

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

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

Conflicts:
	fishe-web/src/main/resources/org/fishe/db/mysql.sql
Adaptation of the programme user interface according to the standard.
 Ressources properties translation : spanish,dutch,german #1
remove unnecessary comment, test update fork, test pull request, etc
Merge pull request #20 from leguman/master

remove unnecessary comment, test update fork, test pull request, etc
Merge pull request #19 from sarace/master

 Ressources properties translation : spanish,dutch,german #1