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
License updated
Merge pull request #18 from htmfilho/master

License updated
Contenu présenté à la deuxième classe.
Merge branch 'master' of https://github.com/fishe/fishe
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