head_ok
Merge branch 'master' of github.com:CarolineCC/mashe
up_to_date_branch
generate_Information_model
generate_Information_Table
relations_and_routes
generate_controller_informations
Merge pull request #26 from CarolineCC/Informations

Informations
Solved conflicts