h2020proposal (21sep15)

git-svn-id: svn://tug.org/texlive/trunk@38428 c570f23f-e606-0410-a88d-b1316a301751

31 files changed, 3005 insertions, 0 deletions

diff --git a/Master/texmf-dist/doc/latex/h2020proposal/README.txt b/Master/texmf-dist/doc/latex/h2020proposal/README.txt
new file mode 100644
index 00000000000..4ccfc4e5955
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/h2020proposal/README.txt
@@ -0,0 +1,56 @@
+%% Copyright (c) 2010, Giacomo Indiveri
+%%
+%%  This latex class is free software: you can redistribute it and/or modify
+%%  it under the terms of the GNU General Public License as published by
+%%  the Free Software Foundation, either version 3 of the License, or
+%%  (at your option) any later version.
+%%
+%%  h2020proposal.cls is distributed in the hope that it will be useful,
+%%  but WITHOUT ANY WARRANTY; without even the implied warranty of
+%%  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+%%  GNU General Public License for more details.
+%%
+%%  You should have received a copy of the GNU General Public License
+%%  along with h2020proposal.cls.  If not, see <http://www.gnu.org/licenses/>.
+%%
+%% Contributors: Elisabetta Chicca
+%%
+%% Disclaimer: The proposal templates provided that make use of this class are based on the 
+%% documents provided by the EU Participants Portal 
+%%
+%% Use the original sources and the http://ec.europa.eu/ documentation for reference. We make no
+%% representations or warranties of any kind, express or implied, about the completeness, accuracy,
+%% reliability, suitability or availability with respect to the original template.
+%% In no event will we be liable for any loss or damage including without limitation, indirect or
+%% consequential loss or damage, or any loss or damage whatsoever arising out of, or in connection
+%% with, the use of this template and/or class.
+%%
+%% The h2020proposal makes use of the memoir class. Read the optimum memman documentation for
+%% info on how to customize your proposal.
+
+
+Dear h2020proposal.cls user,
+
+I hope this LaTeX class will be as useful to you as it has been for me. I managed to write several successful proposals with it, with large teams and sometimes very large documents.
+
+If you do use it to write a real H2020 proposal, please send me an email: giacomo@ini.uzh.ch to acknowledge this. I would like to keep a record of how many times the class has been used.
+
+Good luck with your submission!
+
+giacomo
+
+
+
+Brief description:
+~~~~~~~~~~~~~~~~~~~~
+1. h2020proposal.cls:   (version 1.0 from 2015/09/20)
+   The LaTeX2e class that contains all macros and commands for cross-referencing and generating the tables required for the EU RIA H2020 proposal documents.
+
+
+2. template-fet.tex:   (version 1.0 from 2015/09/20)
+   Example H2020 FET proposal with instructions copied from EU provided word document template, available on the EU H2020 Participant Portal.
+
+3. template-ict.tex:   (version 1.0 from 2015/09/20)
+   Example H2020 ICT proposal with instructions copied from EU provided pdf guidelines, available on the EU H2020 Participant Portal.
+
+
diff --git a/Master/texmf-dist/doc/latex/h2020proposal/gpl.txt b/Master/texmf-dist/doc/latex/h2020proposal/gpl.txt
new file mode 100644
index 00000000000..94a9ed024d3
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/h2020proposal/gpl.txt
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/Master/texmf-dist/doc/latex/h2020proposal/manual/h2020proposal.pdf b/Master/texmf-dist/doc/latex/h2020proposal/manual/h2020proposal.pdf
new file mode 100644
index 00000000000..a2924752ae6
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/h2020proposal/manual/h2020proposal.pdf
diff --git a/Master/texmf-dist/doc/latex/h2020proposal/manual/h2020proposal.tex b/Master/texmf-dist/doc/latex/h2020proposal/manual/h2020proposal.tex
new file mode 100644
index 00000000000..02a27857d29
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/h2020proposal/manual/h2020proposal.tex
@@ -0,0 +1,346 @@
+\documentclass[pdftext]{article}
+
+\usepackage{url}
+
+\title{H2020 Proposal Class\\
+  A LaTeX class for writing EU RIA H2020 proposals.}
+\author{Giacomo Indiveri\\
+  Institute for Neuroinformatics\\
+  University of Zurich and ETH Zurich\\
+  \texttt{giacomo@ini.uzh.ch} } 
+\date{\today}
+
+\begin{document}
+
+\maketitle
+
+\begin{abstract}
+This class provides macros and commands for automating the creation of cross-referenced tables in Grant Proposals for the EU Research and Innovation Actions (RIA). The appropriate tables are created, updated and (re)sorted using the data entered in the class commands, across the document. 
+\end{abstract}
+
+\tableofcontents
+
+\section{Introduction}
+\label{sec:introduction}
+
+The proposals submitted to the H2020 EU program have a very well defined structure, with well defined sections and several cross-references among sections and tables. The templates are available at the EU H2020 Participant Portal \url{http://ec.europa.eu/research/participants/portal/desktop/en/funding/reference_docs.html#h2020-call_ptef-pt}
+
+The \texttt{h2020proposal} class implements a series of macros and commands to simplify the formatting of the document and automate the creation of the several cross-referenced tables required by the template.  This class was inspired by the 2009 fet-workpackage.sty  file developed by Dennis Goehlsdorf and by the 2008 EU proposal LaTeX template files developed by Elisabetta Chicca and Chiara Bartolozzi in 2009. It is the extension of the ICTProposal class, designed by Giacomo Indiveri to create large and complex Integrated-Project proposals of the past FP7 program. 
+
+\subsection{Template document structure}
+
+The document structure should have a Cover page, an Table of Contents (for ICT proposals) or an Abstract (for FET proposals), and five main sections. The first three sections are: Excellence (Section 1.), Impact (Section 2.), and Implementation (Section 3.). The total length of these three sections, including the cover page, has strict page limits. 
+The last two sections include a part dedicated to the description of the ``Members of the consortium'' (Section 4.) and one related to ``Ethics and Security'' (Section  5.) These two sections are not covered by page limit.
+
+The \texttt{h2020proposal} class commands start with the data that needs to appear in the cover page, and most of the other commands manage the cross-referenced tables and lists that appear in Section 3. The other Sections do not require any special commands, and can be created using the standard LaTeX commands.
+
+\subsection{Class Options}
+The user can specify the option ``draft''. In this case, 
+guidelines from the EU \emph{Guide for Applicants} are printed,
+latex labels are displayed on the side, and page-breaks are added between work-packages.
+
+\subsection{Class Requirements}
+
+The \texttt{h2020proposal} class is based on (and requires) the extremely feature rich and configurable \texttt{memoir} class. Additional packages required by the \texttt{h2020proposal} class are:
+\begin{itemize}
+\item \texttt{coolstr} package
+\item \texttt{longtable} package
+\item \texttt{colortbl} package
+\end{itemize}
+
+The \texttt{h2020proposal} class also supports the automated creation of the required Gantt chart. For this, it is necessary to include the pgfgantt package.
+
+By using different \texttt{memoir} class options, it is possible to configure and personalize most of the proposal aspects.
+
+\section{Class commands}
+\label{sec:class-commands}
+
+\subsection{\textbackslash maketitle}
+\label{sec:maketitle}
+
+The \texttt{\textbackslash maketitle} command has been redefined to create the proposal title-page. It uses the data obtained from the following macros:
+\begin{description}
+\item[\texttt{\textbackslash title\{\}}] This macro requires one   argument: the full title of the proposal.\\
+  \emph{E.g.}, \textbf{\textbackslash title\{Future Emerging Technologies\}}
+\item[\texttt{\textbackslash  shortname\{\}}] This macro require as   argument the proposal short name.\\
+  \emph{E.g.}, \textbf{\textbackslash shortname\{FET\}}
+\item[\texttt{\textbackslash fundingscheme\{\}}] This macro require one single argument, which should be either the text  ``\texttt{Small
+    or medium scale focused research project (STREP)}'', or the text  ``\texttt{Large-scale integrating projects (IP)}''.
+\item[\texttt{\textbackslash topic\{\}}] The argument of this macro should be a text string with the specific Work-Program topic addressed.
+\item[\texttt{\textbackslash  coordinator\{\}\{\}\{\}}] This macro requires three arguments. The first argument should be the full name of the coordinator, the second argument should be the coordinator's email address, and the third argument should have the coordinator's fax number.\\
+  \emph{E.g.}, \textbf{\textbackslash coordinator\{John Doe\}\{j.doe@null.com\}\{+41 44 11223344\}}
+\item[\texttt{\textbackslash participant\{\}\{\}\{\}}] This macro requires three arguments as well. The first argument should be the full name of the participant's institution, the second argument should be the institution short name, and the third argument should be the participant's Country. There should be as many \textbackslash participant\{\}\{\}\{\} macros as the number of participants. The first instance of this macro should be reserved for the coordinator.\\
+  \emph{E.g.}, \textbf{\textbackslash participant\{University of Zurich\}\{UZH\}\{Switzerland\}}
+\item[\texttt{\textbackslash  titlelogo\{\}\{\}}] This is an optional macro to include an image as logo on the title page. It has two arguments: the first argument is the name (and path) of the image file, and the second argument is the image scaling factor.\\
+  \emph{E.g.}, \textbf{\textbackslash titlelogo\{logo.png\}\{0.25\}}
+\end{description}
+
+\subsection{\textbackslash makewplist}
+This command creates the work package (wp) list required as Table 3.1b in the EU proposal template. It is a table with a list of work packages with their details (\emph{e.g.}, wp leader, wp start-month, wp end-month, \emph{etc.}). The list is compiled automatically by using the data defined in each \texttt{workpackage} environment (see Section~\ref{sec:wp-envir}). As this data is typically defined later in the document, the \texttt{h2020proposal} class creates an auxiliary file ($<$jobname$>$.lwp) and uses it at the second round of compilation to generate the table.  In order to comply with the table numbering provided by the template, it is necessary to redefine the \texttt{table} counter before issuing this command: \emph{e.g.}\\
+\textbf{\texttt{\textbackslash renewcommand\{\textbackslash thetable\}\{\textbackslash thesection\textbackslash alph\{table\}\}}}\\
+\textbf{\texttt{\textbackslash makewplist}}
+
+\subsection{\textbackslash makedeliverablelist}
+This command creates the List of Deliverables Table 3.1c required by
+the EU template. As for the wp list, it uses the data defined
+(typically later) in each \texttt{workpackage} environment. The
+required information is saved in the auxiliary file $<$jobname.ldl$>$
+and used in subsequent compilation runs to create the table. This
+command sorts the table rows by delivery date.
+
+\subsection{\textbackslash makemilestonelist}
+This command creates the List of Milestones Table 3.2a required by the
+EU template. Milestones need to be be defined before this command is
+issued, by using the  \texttt{\textbackslash
+  milestone} macro:
+\begin{description}
+\item[\texttt{\textbackslash milestone$[\;]$\{\}\{\}\{\}}] This macro
+  has four arguments. The first (optional) argument is the milestone
+  delivery month; the second argument is the name of the milestone;
+  the third argument is the means of verification, and the last
+  argument is the list of work packages involved. The list of work
+  packages can use the latex \texttt{\textbackslash ref} command.
+\end{description}
+Example: \texttt{\textbackslash milestone[24]\{Completed algorithmic
+  model\}\{Software package released and
+  validated\}\{WP\,\textbackslash ref\{wp:modeling\}\}}
+
+\subsection{\textbackslash makerisklist}
+This command creates the Critical risks for implementation Table 3.2b required by the
+EU template. Critical risks relating to project implementation need to be be defined before this command is issued, by using the  \texttt{\textbackslash
+ criticalrisk} macro:
+\begin{description}
+\item[\texttt{\textbackslash criticalrisk\{\}\{\}\{\}}] This macro
+  has three arguments. The first argument is the description of the risk; the second is the list of work packages involved, and the third should describe any risk mitigation measures, and the actions planned for it. The list of work
+  packages involved can use the latex \texttt{\textbackslash ref} command.
+\end{description}
+Example: \texttt{\textbackslash criticalrisk\{The dedicated chip sent to fabrication is not functional.\}\{WP\,\textbackslash ref\{wp:testwp1\}\}\{Resort to Software simulations\}}
+
+
+\subsection{\textbackslash makesummaryofefforttable}
+This command is typically issued after defining the various work
+packages (via the \texttt{workpackage} environment). It uses the data
+defined in each \texttt{workpackage} environment, saves it to the
+auxiliary file $<$jobname$>$.lse and creates the table in subsequent
+compilation runs. The WP leader is identified in the table by showing
+the relevant person-months figure in bold (as specified in the EU
+template).
+
+\subsection{\textbackslash maketasklist}
+This command is not required by the EU template, but it can be
+useful to have an overview of who is responsible for which task, in
+which WP. The command creates an ordered list of tasks with Task ID,
+PI name (in case it is defined in the \texttt{\textbackslash wptask}
+macro), start and end dates, and task title. The required information
+is saved in the auxiliary file $<$jobname.ltk$>$ and used in
+subsequent compilation runs to create the table.
+
+\subsection{\textbackslash makecoststable}
+This command creates a summary of costs table, for each participant, if the sum of the costs for ``travel'', ``equipment'', and ``goods and services'' exceeds 15\% of the personnel costs for that participant. In order to enter the data for these tables it is necessary to use the following macros:
+\begin{description}
+\item[\texttt{\textbackslash costsTravel\{\}\{\}\{\}}] This macro accepts three arguments. The first is the participant short name; the second has to be a number indicating the total amount of euro requested for travel expenses; and the third argument is a text string describing the justification for the requested budget.
+\item[\texttt{\textbackslash costsEquipment\{\}\{\}\{\}}] Similar to the previous macro, this one accepts three arguments: the participant short name, the total amount of euro requested for equipment expenses, and  a text string describing the justification for the requested budget.
+\item[\texttt{\textbackslash costsOther\{\}\{\}\{\}}] This macro is equivalent to the previous two, with the exception that the costs and justification apply to ``other goods and services''.
+\end{description}
+
+
+\subsection{\textbackslash makelritable}
+This command creates a table for every participant that declares costs of large research infrastructure irrespective of the percentage of personnel costs (see Article 6.2 of the General Model Agreement). To enter the data for the table you must use the following macro:
+\begin{description}
+\item[\texttt{\textbackslash costslri\{\}\{\}\{\}}] This macro accepts as arguments the participant short name; the costs of the large research infrastructure, and the justification.
+\end{description}
+In case no costs are declared (in case the macro is not instantiated), no tables are generated.
+
+\section{The \texttt{workpackage} environment}
+\label{sec:wp-envir}
+
+Each proposal work package should be defined using the
+\texttt{workpackage} environment. If multiple work packages are
+described as separate files and included in the proposal using the
+\texttt{\textbackslash include} command, use the
+\texttt{\textbackslash input} command for the first file.  The
+\texttt{workpackage} environment has an optional argument which is the
+wp title. The syntax of this
+environment is (without or with optional argument):\\
+\begin{center}
+\begin{tabular}{l | l}
+\textbf{\texttt{\textbackslash begin\{workpackage\}}} &
+\textbf{\texttt{\textbackslash begin\{workpackage\}\{WP Title\}}} \\
+\ldots & \ldots \\
+\textbf{\texttt{\textbackslash end\{workpackage\}}} & 
+\textbf{\texttt{\textbackslash end\{workpackage\}}}
+\end{tabular}
+\end{center}
+
+The standard way of defining labels (\emph{e.g.}, \textbackslash
+label\{wp:management\}) can be used, so that different wps can be
+referenced within the proposal document using the standard
+\textbackslash ref\{\} command.
+
+The following macros can be used within the \texttt{workpackage}
+environment:
+\begin{description}
+\item[\texttt{\textbackslash wptitle\{\}}] This macro specifies the wp
+  title.
+\item[\texttt{\textbackslash wpstart\{\}}] This macro specifies the wp
+  start month.
+\item[\texttt{\textbackslash wpend\{\}}] This macro specifies the wp
+  end month.
+\item[\texttt{\textbackslash wptype\{\}}] This macro specifies the wp
+  activity type, and should be one of: ``RTD'', ``DEM'', ``MGT'', or
+  ``OTHER''.
+\item[\texttt{\textbackslash personmonths\{\}\{\}}] This macro
+  specifies the person months used for each participant. It has two
+  required arguments. The first one is the participant short name,
+  defined with the \texttt{\textbackslash participant} macro. The
+  second argument is an integer specifying the person-months allocated
+  to the specified participant. This command can have a ``*'' appended
+  at the end, to indicate that the participant specified is the wp
+  leader. \emph{E.g.}\\
+  \textbf{\texttt{\textbackslash personmonths*\{UZH\}\{24\}}}\\
+  \textbf{\texttt{\textbackslash personmonths\{ETHZ\}\{18\}}}\\
+  (the UZH partner is the wp leader and will use 24 person months,
+  while ETHZ is an additional wp participant that will use 18 person
+  months).
+\end{description}
+
+
+\subsection{\texttt{\textbackslash makewptable} command}
+\label{sec:makewptable}
+
+This command creates the top table in the wp environment with all the
+info specified using the macros described above. The WP leader data is
+shown in boldface.
+
+Three additional environments need to be defined within the
+\texttt{workpackage} environment, to complete the wp description: the
+Objectives (\texttt{wpobjectives}), the Description of work
+(\texttt{wpdescription}), and the Deliverables
+(\texttt{wpdeliverables}) environments.
+
+\subsection{The \texttt{wpobjectives} environment}
+\label{sec:object-envir}
+
+This environment has no specific macros. It is useful for creating a
+framed paragraph, in which the user can write arbitrary
+text. \emph{E.g.}
+\begin{verbatim}
+  \begin{wpobjectives}
+    This work package has the following objectives:
+    \begin{enumerate}
+    \item To develop ....
+    \item To apply this ....
+    \item etc.
+    \end{enumerate}
+  \end{wpobjectives}
+\end{verbatim}
+
+\subsection{The \texttt{wpdescription} environment}
+\label{sec:descr-work-envir}
+
+This environment creates a separate framed paragraph, in which the
+details of the wp are specified. Within this environment it is
+possible to define multiple Tasks, using the \texttt{\textbackslash
+  wptask} macro:
+%{start-m}{end-m}{title}{description}   
+\begin{description}
+\item[\texttt{\textbackslash wptask\{\}\{\}\{\}\{\}\{\}\{\}}] This
+  macro has 6 arguments. The first argument specifies
+  the name of the Task leader responsible for the task using the short name defined with the
+  \texttt{\textbackslash participant} macro. The
+  second argument specifies the list of contributor partners. The third and fourth
+  arguments specify task start and end date respectively. The fifth
+  argument represents the Task title, while the last one is text with
+  a short description of the task.
+\end{description}
+The \texttt{\textbackslash wptask} macro creates an ordered list of
+tasks within the \texttt{wpdescription} environment and stores the
+data relative to the WP tasks. The information specified here is used
+also by the \texttt{\textbackslash maketasklist} macro, which creates an
+ordered list of tasks to show which PI is responsible for which task.
+
+The information gathered with this macro could also be used to
+automatically create Gantt charts or timing diagrams (not implemented
+currently).
+
+\subsection{The \texttt{wpdeliverables} environment}
+\label{sec:deliv-envir}
+
+This environment creates a third framed paragraph, with a list of
+deliverables. To specify the information associated to each
+deliverables, it is necessary to use the  \texttt{\textbackslash
+  wpdeliverable} macro:
+\begin{description}
+\item[\texttt{\textbackslash wpdeliverable$[\,]$\{\}\{\}\{\}\{\}}] This
+  macro has 5 arguments. The first optional argument specified the
+  delivery date (month). The second argument specifies the participant responsible for producing the deliverable. The third argument specifies the deliverable
+  nature, and should be one of ``R'', ``P'', ``D'', or ``O'' (R =
+  Report, P = Prototype, D = Demonstrator, O = Other). The fourth
+  argument specified the deliverable dissemination level, and should
+  be one of ``PU'', ``PP'', ``RE'', or ``CO'' (PU = Public, PP =
+  Restricted to other program participants, including the Commission
+  Services, RE = Restricted to a group specified by the consortium,
+  including the Commission Services, CO = Confidential, only for
+  members of the consortium, including the Commission Services.
+  The last argument specifies the deliverable title.
+\end{description}
+
+
+\section{Labels and References}
+\label{sec:labels-references}
+
+All proposal environments have their own internal labels and counters,
+which get generated automatically. If you want to reference an
+environment explicitly (e.g., reference a specific deliverable or work
+package with a custom name) you should use the commands
+\texttt{\textbackslash label\{\}} and \texttt{\textbackslash ref\{\}}.
+
+Environments that use the \texttt{\textbackslash begin\{\}} and
+\texttt{\textbackslash end\{\}} constructs can have the label defined
+within the constructs. Environments defined with single commands
+(e.g. \texttt{\textbackslash wpdeliverable}) should have the label
+defined just after the environment definition.
+
+\section{Conclusions}
+\label{sec:conclusions}
+
+The \texttt{h2020proposal} class should be useful for automating the
+process of creating complex proposal documents with many work packages
+and inter dependencies. If one uses separate files to include multiple
+work packages (\emph{e.g.}, using the \texttt{\textbackslash
+  input\{\}} or \texttt{\textbackslash include\{\}} commands), it is
+going to be easy to re-shuffle the order of work packages, and the
+\texttt{h2020proposal} class will take care of re-assigning wp and
+deliverable counters, re-ordering deliverables and resorting the
+tables. Also last-minute changes to person-months allocated in any of
+the work packages will be automatically accounted for in the various
+tables. The \texttt{h2020proposal} class was designed to maintain
+consistency across the whole document, and quickly (automatically)
+update the proposal tables.
+
+The class is still in a beta-testing stage. Please do not
+distribute. If you have suggestions or find bugs and problems, please
+report them to Giacomo Indiveri \url{giacomo@ini.uzh.ch}.
+
+\section*{Copyright and license}
+The \texttt{h2020proposal} Class\\
+Copyright 2015 \copyright, Giacomo Indiveri 
+
+ This latex class is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ h2020proposal.cls is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with h2020proposal.  If not, see <http://www.gnu.org/licenses/>.
+
+\section*{Disclaimer}
+\label{sec:disclaimer}
+Use the original source and the http://ec.europa.eu/ documentation for reference. We make no representations or warranties of any kind, express or implied, about the completeness, accuracy, reliability, suitability or availability with respect to the original template. In no event will we be liable for any loss or damage including without limitation, indirect or consequential loss or damage, or any loss or damage whatsoever arising out of, or in connection with, the use of this template and/or class.
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/h2020proposal/template-fet/abstract.tex b/Master/texmf-dist/doc/latex/h2020proposal/template-fet/abstract.tex
new file mode 100644
index 00000000000..93417be38e6
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/h2020proposal/template-fet/abstract.tex
@@ -0,0 +1,3 @@
+\begin{abstract}
+  Project abstract. \textbf{Important:} limit to 2000 characters. 
+\end{abstract}
diff --git a/Master/texmf-dist/doc/latex/h2020proposal/template-fet/appendix.tex b/Master/texmf-dist/doc/latex/h2020proposal/template-fet/appendix.tex
new file mode 100644
index 00000000000..e493fa0bfec
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/h2020proposal/template-fet/appendix.tex
@@ -0,0 +1,2 @@
+%% Proposal appendix
+
diff --git a/Master/texmf-dist/doc/latex/h2020proposal/template-fet/ethics.tex b/Master/texmf-dist/doc/latex/h2020proposal/template-fet/ethics.tex
new file mode 100644
index 00000000000..743e270eadb
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/h2020proposal/template-fet/ethics.tex
@@ -0,0 +1,43 @@
+\chapter{Ethics and Security}
+\label{cha:ethics}
+\instructions{
+\textit{This section is not covered by the page limit.}
+}
+
+\section{Ethics}
+\label{sec:ethics}
+\instructions{
+If you have entered any ethics issues in the ethical issue table in the administrative proposal forms, you must:
+\begin{itemize}
+\item submit an ethics self-assessment, which:
+\begin{itemize}
+\item describes how the proposal meets the national legal and ethical requirements of the country or countries where the tasks raising ethical issues are to be carried out; 
+\item explains in detail how you intend to address the issues in the ethical issues table, in particular as regard:
+\begin{itemize}
+\item research objectives (e.g. study of vulnerable populations, dual use, etc.)
+\item research methodology (e.g. clinical trials, involvement of children and related consent procedures, protection of any data collected, etc.) 
+\item the potential impact of the research (e.g. dual use issues, environmental damage, stigmatisation of particular social groups, political or financial retaliation, benefit-sharing,  malevolent use, etc.).
+\end{itemize}
+\end{itemize}
+\item provide the documents that you need under national law(if you already have them), e.g.:
+\begin{itemize}
+\item an ethics committee opinion;
+\item the document notifying activities raising ethical issues or authorising such activities;
+\end{itemize}
+\end{itemize}
+\textit{\indent If these documents are not in English, you must also submit an English summary of them (containing, if available, the conclusions of the committee or authority concerned).}
+\vskip0.2cm
+\textit{If you plan to request these documents specifically for the project you are proposing, your request must contain an explicit reference to the project title.}
+}
+
+\section{Security}\footnote{Article 37.1 of the Model Grant Agreement: Before disclosing results of activities raising security issues to a third party (including affiliated entities), a beneficiary must inform the coordinator -- which must request written approval from the Commission/Agency. Article 37.2: Activities related to ``classified deliverables'' must comply with the ``security requirements'' until they are declassified. Action tasks related to classified deliverables may not be subcontracted without prior explicit written approval from the Commission/Agency. The beneficiaries must inform the coordinator -- which must immediately inform the Commission/Agency -- of
+any changes in the security context and --if necessary -- request for Annex 1 to be amended (see Article 55).
+}
+\label{sec:security}
+\instructions{
+Please indicate if your project will involve:
+\begin{itemize}
+\item activities or results raising security issues: (YES/NO)
+\item ``EU-classified information'' as background or results: (YES/NO)
+\end{itemize}
+}
diff --git a/Master/texmf-dist/doc/latex/h2020proposal/template-fet/excellence.tex b/Master/texmf-dist/doc/latex/h2020proposal/template-fet/excellence.tex
new file mode 100644
index 00000000000..2ae7f99959d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/h2020proposal/template-fet/excellence.tex
@@ -0,0 +1,54 @@
+%%% Important. To have correct table numberings
+\renewcommand{\thetable}{\thesection\alph{table}}
+
+\chapter[Excellence]{S\&T Excellence}
+\label{cha:excellence}
+\instructions{
+Your proposal must address a work programme topic for this call for proposals. \\
+\textit{This section of your proposal will be assessed only to the extent that it is relevant to that topic.}\\
+}
+
+\section{Targeted breakthrough, Long term vision and Objectives}
+\label{sec:objectives}
+\instructions{
+\begin{itemize}
+\item Describe the targeted scientific breakthrough of the project.
+\item Describe how the targeted breakthrough of the project contributes to a long-term vision for new technologies.
+\item Describe the specific objectives for the project, which should be clear, measurable, realistic and achievable within the duration of the project.
+\end{itemize}
+}
+
+\section{Relation to the work programme}
+\label{sec:relation-to-work-programme}
+\instructions{
+\begin{itemize}
+\item Indicate the work programme topic to which your proposal relates, and explain how your proposal addresses the specific challenge and scope of that topic, as set out in the work programme.
+\end{itemize}
+}
+
+
+\section{Novelty, level of ambition and foundational character}
+\label{sec:ambition}
+\instructions{
+\begin{itemize}
+\item Describe the advance your proposal would provide beyond the state-of-the-art, and to what extent the proposed work is ambitious, novel and of a foundational nature. Your answer could refer to the ground-breaking nature of the objectives, concepts involved, issues and problems to be addressed, and approaches and methods to be used. 
+\end{itemize}
+}
+
+\section{Research methods}
+\label{sec:methods}
+\instructions{
+\begin{itemize}
+\item Describe the overall research approach, the methodology and explain its relevance to the objectives.  
+\item Where relevant, describe how sex and/or gender analysis is taken into account in the project’s content.
+\end{itemize}
+\textit{Sex and gender refer to biological characteristics and social/cultural factors respectively. For guidance on methods of sex/gender analysis and the issues to be taken into account, please refer to \url{http://ec.europa.eu/research/science-society/gendered-innovations/index_en.cfm}}
+}
+
+\section{Interdisciplinary nature}
+\label{sec:interdisciplinary}
+\instructions{
+\begin{itemize}
+\item Describe the research disciplines involved and the added value of the inter-disciplinarity.
+\end{itemize}
+}
diff --git a/Master/texmf-dist/doc/latex/h2020proposal/template-fet/gantt.tex b/Master/texmf-dist/doc/latex/h2020proposal/template-fet/gantt.tex
new file mode 100644
index 00000000000..b76534ab923
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/h2020proposal/template-fet/gantt.tex
@@ -0,0 +1,42 @@
+%project Gantt chart
+
+
+\begin{figure}
+  \centering
+
+  \begin{ganttchart}%
+    [
+    x unit = 0.25cm,
+    y unit title=0.4cm,
+    y unit chart=0.4cm,
+    vgrid,
+    title/.style={draw=black!50, fill=green!50!black},
+    title label font=\sffamily\bfseries\color{white},
+    title label anchor/.style={below=-1.6ex},
+    title left shift=.05,
+    title right shift=-.05,
+    title height=1,
+    bar/.style={draw=none, fill=blue!75},
+    bar height=.6,
+    bar label font=\small\color{black!50},
+    milestone label font=\small\color{red!50},
+    group right shift=0,
+    group top shift=.6,
+    group height=.3,
+    group peaks={}{}{.2},
+    incomplete/.style={fill=red}]{60}
+    
+    \gantttitle{ACRONYM}{60} \\
+    \gantttitle{Year 1}{12} 
+    \gantttitle{Year 2}{12} 
+    \gantttitle{Year 3}{12}  
+    \gantttitle{Year 4}{12}  
+    \gantttitle{Year 5}{12} \\ 
+    
+    \ganttchartdata % data generated by the ICTProposal.cls
+    
+  \end{ganttchart}
+
+  \caption[Gantt chart]{Project Gantt chart.}
+  \label{fig:gantt}
+\end{figure}
diff --git a/Master/texmf-dist/doc/latex/h2020proposal/template-fet/impact.tex b/Master/texmf-dist/doc/latex/h2020proposal/template-fet/impact.tex
new file mode 100644
index 00000000000..c447dd4e658
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/h2020proposal/template-fet/impact.tex
@@ -0,0 +1,52 @@
+\chapter{Impact}
+\label{cha:impact}
+
+
+\section{Expected impact} 
+\label{sec:expected-impact}
+\instructions{
+\textit{Please be specific, and provide only information that applies to the proposal and its objectives. Wherever possible, use quantified indicators and targets.}\\
+\begin{itemize}
+\item Describe how your project will contribute to the expected impacts set out in the work programme under the relevant topic. 
+\item Describe the importance of the technological outcome with regards to its transformational impact on science, technology and/or society.
+\item Describe the empowerment of new and high-potential actors towards future technological leadership.
+\end{itemize}
+}
+
+
+
+
+
+\section{Measures to maximize impact} 
+\label{sec:maximize-impact}
+
+\subsection{Dissemination and exploitation of results}
+\label{sec:dissemination-exploitation}
+\instructions{
+\begin{itemize}
+\item Provide a plan for disseminating and exploiting the project results. The plan, which should be proportionate to the scale of the project, should contain measures to be implemented both during and after the project. 
+\item Explain how the proposed measures will help to achieve the expected impact of the project. 
+\item Where relevant, include information on how the participants will manage the research data generated and/or collected during the project, in particular addressing the following issues:\footnote{For further guidance on research data management, please refer to the H2020 Online Manual on the Participant Portal.}
+\begin{itemize}
+\item What types of data will the project generate/collect?
+\item What standards will be used?
+\item How will this data be exploited and/or shared/made accessible for verification and re-use? If data cannot be made available, explain why.
+\item How will this data be curated and preserved?
+\end{itemize}
+\emph{You will need an appropriate consortium agreement to manage (amongst other things) the ownership and access to key knowledge (IPR, data etc.). Where relevant, these will allow you, collectively and individually, to pursue market opportunities arising from the project's results.} \\
+\emph{The appropriate structure of the consortium to support exploitation is addressed in section 3.3.}\\
+\begin{itemize}
+\item Outline the strategy for knowledge management and protection. Include measures to provide open access (free on-line access, such as the ``green'' or ``gold'' model) to peer-reviewed scientific publications which might result from the project.\footnote{Open access must be granted to all scientific publications resulting from Horizon 2020 actions. Further guidance on open access is available in the H2020 Online Manual on the Participant Portal.}\\
+\end{itemize} 
+\emph{Open access publishing (also called 'gold' open access) means that an article is immediately provided in open access mode by the scientific publisher. The associated costs are usually shifted away from readers, and instead (for example) to the university or research institute to which the researcher is affiliated, or to the funding agency supporting the research.}\\
+\emph{Self-archiving (also called 'green' open access) means that the published article or the final peer-reviewed manuscript is archived by the researcher - or a representative - in an online repository before, after or alongside its publication. Access to this article is often - but not necessarily - delayed (``embargo period''), as some scientific publishers may wish to recoup their investment by selling subscriptions and charging pay-per-download/view fees during an exclusivity period.}
+\end{itemize}
+}
+
+\subsection{Communication activities}
+\label{sec:communication}
+\instructions{
+\begin{itemize}
+\item Describe the proposed communication measures for promoting the project and its findings during the period of the grant. Measures should be proportionate to the scale of the project, with clear objectives.  They should be tailored to the needs of various audiences, including groups beyond the project's own community. Where relevant, include measures for public/societal engagement on issues related to the project. 
+\end{itemize}
+}
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/h2020proposal/template-fet/implementation.tex b/Master/texmf-dist/doc/latex/h2020proposal/template-fet/implementation.tex
new file mode 100644
index 00000000000..4281a169153
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/h2020proposal/template-fet/implementation.tex
@@ -0,0 +1,169 @@
+\chapter{Implementation}
+\label{cha:implementation}
+
+\section{Project work plan}
+\label{sec:work-plan}
+\instructions{
+Please provide the following:
+\begin{itemize}
+\item brief presentation of the overall structure of the work plan;
+\item timing of the different work packages and their components (Gantt chart or similar);
+\item detailed work description, i.e.:
+\begin{itemize}
+\item a description of each work package (table 3.1a);
+\item a list of work packages (table 3.1b);
+\item a list of major deliverables (table 3.1c);
+\end{itemize}
+\item graphical presentation of the components showing how they inter-relate (Pert chart or similar).
+\end{itemize}
+\vskip0.2cm
+\emph{\indent Give full details. Base your account on the logical structure of the project and the stages in which it is to be carried out. Include details of the resources to be allocated to each work package. The number of work packages should be proportionate to the scale and complexity of the project.}
+\vskip0.2cm
+\emph{You should give enough detail in each work package to justify the proposed resources to be allocated and also quantified information so that progress can be monitored, including by the Commission.}
+\vskip0.2cm
+\emph{You are advised to include a distinct work package on ``management'' (see section 3.2) and to give due visibility in the work plan to ``dissemination and exploitation'' and ``communication activities'', either with distinct tasks or distinct work packages.}
+\vskip0.2cm
+\emph{You will be required to include an updated (or confirmed) ``plan for the dissemination and exploitation of results'' in both the periodic and final reports. (This does not apply to topics where a draft plan was not required.) This should include a record of activities related to dissemination and exploitation that have been undertaken and those still planned. A report of completed and planned communication activities will also be required.}
+\vskip0.2cm
+\emph{If your project is taking part in the Pilot on Open Research Data\footnote{Certain actions under Horizon 2020 participate in the ‘Pilot on Open Research Data in Horizon 2020’. All other actions can participate on a voluntary basis to this pilot.  Further guidance is available in the H2020 Online Manual on the Participant Portal.}, you must include a 'data management plan' as a distinct deliverable within the first 6 months of the project. A template for such a plan is given in the guidelines on data management in the H2020 Online Manual. This deliverable will evolve during the lifetime of the project in order to present the status of the project's reflections on data management.}
+\vskip0.2cm
+\emph{\noindent \textbf{Definitions:}}
+\vskip0.2cm
+\emph{\ul{``Work package''} means a major sub-division of the proposed project.}
+\vskip0.2cm
+\emph{\ul{``Deliverable''} means a distinct output of the project, meaningful in terms of the project's overall objectives and constituted by a report, a document, a technical diagram, a software etc.}
+\vskip0.2cm
+\emph{\ul{``Milestones''} means control points in the project that help to chart progress. Milestones may correspond to the completion of a key deliverable, allowing the next phase of the work to begin. They may also be needed at intermediary points so that, if problems have arisen, corrective measures can be taken. A milestone may be a critical decision point in the project where, for example, the consortium must decide which of several technologies to adopt for further development.}
+\vskip0.2cm
+\emph{\noindent Report on work progress is done primarily through the periodic and final reports. Deliverables should complement these reports and should be kept to the minimum necessary.}
+}
+
+% Gantt chart in latex (requires pfggantt.sty file)
+%\include{gantt}
+
+\subsection{Work package description}
+\label{sec:wps}
+
+%Include work-packages as separate files
+\input{wp-management}             %Use \input for first WP
+\include{wp-develop}
+\include{wp-test}
+
+\subsection{List of work packages}
+\label{sec:wplist}
+\makewplist
+
+\subsection{List of deliverables}\footnote{If your action taking part in the Pilot on Open Research Data, you must include a data management plan as a distinct deliverable within the first 6 months of the project.  This deliverable will evolve during the lifetime of the project in order to present the status of the project's reflections on data management. A template for such a plan is available on the Participant Portal (Guide on Data Management).}
+\label{sec:deliverables}
+\instructions{
+\textbf{KEY}\\
+\emph{Deliverable numbers in order of delivery dates. Please use the numbering convention $<$WP number$>.<$number of deliverable within that WP$>$.}
+\vskip0.2cm
+\noindent\emph{For example, deliverable 4.2 would be the second deliverable from work package 4.}
+\vskip0.2cm
+\noindent\textbf{Type:}\\
+\emph{Use one of the following codes:}\\
+\indent R: Document, report (excluding the periodic and final reports)\\
+\indent DEM: Demonstrator, pilot, prototype, plan designs\\
+\indent DEC: Websites, patents filing, press \& media actions, videos, etc.\\
+\indent OTHER: Software, technical diagram, etc.
+\vskip0.2cm
+\noindent\textbf{Dissemination level}:\\
+\emph{Use one of the following codes:}\\
+\indent PU = Public, fully open, e.g. web\\
+\indent CO = Confidential, restricted under conditions set out in Model Grant Agreement\\
+\indent CI = Classified, information as referred to in Commission Decision 2001/844/EC.\\
+\vskip0.2cm
+\noindent\textbf{Delivery date}:\\
+Measured in months from the project start date (month 1).
+}
+\makedeliverablelist
+
+
+\section{Management and risk assessment}
+\label{sec:management}
+\setcounter{table}{0}
+\instructions{
+\begin{itemize}
+\item Describe the organisational structure and the decision-making ( including a list of
+milestones (table 3.2a))
+\item Describe any critical risks, relating to project implementation, that the stated project's objectives may not be achieved. Detail any risk mitigation measures. Please provide a table with critical risks identified and mitigating actions (table 3.2b)
+\end{itemize}
+}
+
+
+
+\subsection{List of milestones}
+\label{sec:milestones}
+\instructions{
+\vskip0.2cm
+\noindent\textbf{KEY}\\
+\textbf{Estimated date}\\
+\emph{Measured in months from the project start date (month 1)}
+\vskip0.2cm
+\noindent\textbf{Means of verification}\\
+\emph{Show how you will confirm that the milestone has been attained. Refer to indicators if appropriate. For example: a laboratory prototype that is ‘up and running’; software released and validated by a user group; field survey complete and data quality validated.}}
+
+\milestone[24]{Completed simulator development}{Software released and
+  validated}{1}
+\milestone[36]{Final demonstration}{Application of results}{WP\,\ref{wp:test}}
+
+\makemilestoneslist
+
+\subsection{Critical risks for implementation}
+\label{sec:risks}
+
+\criticalrisk{The dedicated chip sent to fabrication is not functional.}{WP\,\ref{wp:test}}{Resort to Software simulations}
+
+\makerisklist
+
+\section{Consortium as a whole} 
+\label{sec:consortium}
+\instructions{
+\emph{The individual members of the consortium are described in a separate section 4. There is no need to repeat that information here.}
+\begin{itemize}
+\item Describe the consortium. How will it match the project’s objectives? How do the members complement one another (and cover the value chain, where appropriate)? In what way does each of them contribute to the project? How will they be able to work effectively together? 
+\item If applicable, describe how the project benefits from any industrial/SME involvement.
+\item \textbf{Other countries:} If one or more of the participants requesting EU funding is based in a country that is not automatically eligible for such funding (entities from Member States of the EU, from Associated Countries and from one of the countries in the exhaustive list included in General Annex A of the work programme are automatically eligible for EU funding), explain why the participation of the entity in question is essential to carrying out the project. 
+\end{itemize}
+}
+
+\section{Resources to be committed} 
+\label{sec:resources}
+\setcounter{table}{0}
+\instructions{
+\emph{Please make sure the information in this section matches the costs as stated in the budget table in section 3 of the administrative proposal forms, and the number of person/months, shown in the detailed work package descriptions.}
+\vskip0.2cm
+Please provide the following:\\
+\begin{itemize}
+\item a table showing number of person/months required (table 3.4a)
+\item a table showing ``other direct costs'' (table 3.4b) for participants where those costs exceed 15\% of the personnel costs (according to the budget table in section 3 of the administrative proposal forms)  
+\end{itemize}
+}
+
+\subsection{Summary of staff efforts}
+\instructions{Table 3.4a: \emph{Please indicate the number of person/months over the whole duration of the planned work, for each work package, for each participant. Identify the work-package leader for each WP by showing the relevant person-month figure in bold.}}
+\makesummaryofefforttable
+
+\subsection{‘Other direct cost’ items (travel, equipment, other goods and services, large research infrastructure)}
+\instructions{
+Please provide a table of summary of costs for each participant, if the sum of the costs for ``travel'', ``equipment'', and ``goods and services'' exceeds 15\% of the personnel costs for that participant (according to the budget table in section 3 of the proposal administrative forms).
+}
+
+\costsTravel{UoC}{2500}{3 pairwise meetings for 2 people, 2 conferences for 3 people, 3 internal project meetings for 3 people}
+\costsEquipment{UoC}{3000}{CAD workstation for chip design}
+\costsOther{UoC}{60000}{Fabrication of 2 VLSI chips}
+\costsOther{UoP2}{40000}{Fabrication of prototype PCBs}
+
+\makecoststable
+
+
+\instructions{
+Please complete the table below for all participants that would like to declare costs of large research infrastructure under Article 6.2 of the General Model Agreement, irrespective of the percentage of personnel costs. Please indicate (in the justification) if the beneficiary's methodology for declaring the costs for large research infrastructure has already been positively assessed by the Commission.\\
+Note: Large research infrastructure means research infrastructure of a total value of at least EUR 20 million, for a beneficiary. More information and further guidance on the direct costing for the large research infrastructure is available in the H2020 Online Manual on the Participant Portal.
+}
+
+\costslri{UoP3}{400000}{Synchrotron}
+\costslri{UoC}{400000}{Synchrotron}
+
+\makelritable
diff --git a/Master/texmf-dist/doc/latex/h2020proposal/template-fet/members.tex b/Master/texmf-dist/doc/latex/h2020proposal/template-fet/members.tex
new file mode 100644
index 00000000000..ba227346344
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/h2020proposal/template-fet/members.tex
@@ -0,0 +1,82 @@
+\chapter{Members of the consortium}
+\label{cha:members}
+
+\instructions{
+\textit{This section is not covered by the page limit.}
+\vskip0.2cm
+\textit{The information provided here will be used to judge the operational capacity.}
+}
+
+\section{Participants (applicants)}
+\label{sec:participants}
+
+\instructions{
+Please provide, for each participant, the following (if available):\\
+\begin{itemize}
+\item a description of the legal entity and its main tasks, with an explanation of how its profile matches the tasks in the proposal;
+\item a curriculum vitae or description of the profile of the persons, including their gender, who will be primarily responsible for carrying out the proposed research and/or innovation activities;
+\item a list of up to 5 relevant publications, and/or products, services (including widely-used datasets or software), or other achievements relevant to the call content;
+\item a list of up to 5 relevant previous projects or activities, connected to the subject of this proposal;
+\item a description of any significant infrastructure and/or any major items of technical equipment, relevant to the proposed work;
+\item any other supporting documents specified in the work programme for this call.
+\end{itemize}
+}
+
+\section{Third parties involved in the project (third party resources)}
+\label{sec:third-parties}
+
+\instructions{
+\textit{Please complete, for each participant, the following table (or simply state "No third parties involved", if applicable).} \\
+If yes in first row, please describe and justify the tasks to be subcontracted. If yes in second row, please describe the third party, the link of the participant to the third party, and describe and justify the foreseen tasks to be performed by the third party\footnote{A third party that is an affiliated entity or has a legal link to a participant implying a collaboration not limited to the action. (Article 14 of the Model Grant Agreement).}. If yes in third row, please describe the third party and their contributions.}
+
+\begin{tabular}{|p{.85\textwidth}|p{.05\textwidth}|}
+  \hline  
+  \multicolumn{2}{|l|}{\cellcolor[gray]{0.8}\textbf{UoC}}\\
+  \hline
+  Does the participant plan to subcontract certain tasks (please note that core tasks of the project should not be sub-contracted) &
+  \textbf{Y/N} \\
+  \hline
+Does the participant envisage that part of its work is performed by linked
+third parties &
+  \textbf{Y/N} \\
+  \hline
+  Does the participant envisage the use of contributions in kind provided by
+third parties (Articles 11 and 12 of the General Model Grant Agreement) &
+  \textbf{Y/N}\\
+  \hline
+\end{tabular}
+
+\begin{tabular}{|p{.85\textwidth}|p{.05\textwidth}|}
+  \hline  
+  \multicolumn{2}{|l|}{\cellcolor[gray]{0.8}\textbf{UoP1}}\\
+  \hline
+  Does the participant plan to subcontract certain tasks (please note that core tasks of the project should not be sub-contracted) &
+  \textbf{Y/N} \\
+  \hline
+Does the participant envisage that part of its work is performed by linked
+third parties &
+  \textbf{Y/N} \\
+  \hline
+  Does the participant envisage the use of contributions in kind provided by
+third parties (Articles 11 and 12 of the General Model Grant Agreement) &
+  \textbf{Y/N}\\
+  \hline
+\end{tabular}
+
+
+\begin{tabular}{|p{.85\textwidth}|p{.05\textwidth}|}
+  \hline  
+  \multicolumn{2}{|l|}{\cellcolor[gray]{0.8}\textbf{UoP2}}\\
+  \hline
+  Does the participant plan to subcontract certain tasks (please note that core tasks of the project should not be sub-contracted) &
+  \textbf{Y/N} \\
+  \hline
+Does the participant envisage that part of its work is performed by linked
+third parties &
+  \textbf{Y/N} \\
+  \hline
+  Does the participant envisage the use of contributions in kind provided by
+third parties (Articles 11 and 12 of the General Model Grant Agreement) &
+  \textbf{Y/N}\\
+  \hline
+\end{tabular}
diff --git a/Master/texmf-dist/doc/latex/h2020proposal/template-fet/template-fet.pdf b/Master/texmf-dist/doc/latex/h2020proposal/template-fet/template-fet.pdf
new file mode 100644
index 00000000000..c9a6a7662cd
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/h2020proposal/template-fet/template-fet.pdf
diff --git a/Master/texmf-dist/doc/latex/h2020proposal/template-fet/template-fet.tex b/Master/texmf-dist/doc/latex/h2020proposal/template-fet/template-fet.tex
new file mode 100644
index 00000000000..af32a7f3938
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/h2020proposal/template-fet/template-fet.tex
@@ -0,0 +1,229 @@
+%% EU FET Open  Proposal LaTeX template
+%% V1.0
+%% Based on the h2020proposal.cls LaTeX class for writing EU H2020 RIA proposals.
+%% 
+%% Copyright (c) 2010, Giacomo Indiveri
+%%
+%%  This latex class is free software: you can redistribute it and/or modify
+%%  it under the terms of the GNU General Public License as published by
+%%  the Free Software Foundation, either version 3 of the License, or
+%%  (at your option) any later version.
+%%
+%%  h2020proposal.cls is distributed in the hope that it will be useful,
+%%  but WITHOUT ANY WARRANTY; without even the implied warranty of
+%%  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+%%  GNU General Public License for more details.
+%%
+%%  You should have received a copy of the GNU General Public License
+%%  along with h2020proposal.cls.  If not, see <http://www.gnu.org/licenses/>.
+%%
+%% Contributors: Elisabetta Chicca
+%%
+%% Disclaimer: The template is based on the document provided by the EU Participants Portal 
+%% "Part B  Template FETOPEN sections 1-3 Final.doc"
+%%
+%% Use the original source and the http://ec.europa.eu/ documentation for reference. We make no
+%% representations or warranties of any kind, express or implied, about the completeness, accuracy,
+%% reliability, suitability or availability with respect to the original template.
+%% In no event will we be liable for any loss or damage including without limitation, indirect or
+%% consequential loss or damage, or any loss or damage whatsoever arising out of, or in connection
+%% with, the use of this template and/or class.
+%%
+%% Makes use of the memoir class. Read the optimum memman documentation for
+%% info on how to customize your proposal.
+
+
+%\documentclass[]{h2020proposal}     % Remove 'draft' option for final version
+\documentclass[draft]{h2020proposal} % Use 'draft' option to show comments and labels
+
+% For in-line comments use:
+% \marginpar{comment text}
+
+%% Extra Packages
+%% ========
+%\usepackage{fontspec}% Latin Modern by default with xelatex
+
+%% LaTeX Font encoding -- DO NOT CHANGE
+\usepackage[OT1]{fontenc}
+
+%% Input encoding 'utf8'. In some cases you might need 'utf8x' for
+%% extra symbols. Not all editors, especially on Windows, are UTF-8
+%% capable, so you may want to use 'latin1' instead.
+%\usepackage[utf8,latin1]{inputenc}
+
+%% Babel provides support for languages.  'english' uses British
+%% English hyphenation and text snippets like "Figure" and
+%% "Theorem". Use the option 'ngerman' if your document is in German.
+%% Use 'american' for American English.  Note that if you change this,
+%% the next LaTeX run may show spurious errors.  Simply run it again.
+%% If they persist, remove the .aux file and try again.
+\usepackage[english]{babel}
+
+%% For underlined wrapped text.
+\usepackage{soul}
+
+%% This changes default fonts for both text and math mode to use Herman Zapfs
+%% excellent Palatino font.  Do not change this.
+\usepackage[sc]{mathpazo} % Not needed with xelatex
+
+%% The AMS-LaTeX extensions for mathematical typesetting.  Do not
+%% remove.
+\usepackage{amsmath,amssymb,amsfonts,mathrsfs}
+
+%% Gantt Charts in LaTeX
+\usepackage{pgfgantt}
+
+%% LaTeX' own graphics handling
+\usepackage{graphicx}
+
+%% Fancy character protrusion.  Must be loaded after all fonts.
+\usepackage[activate]{pdfcprot}
+
+%% Nicer tables.  Read the excellent documentation.
+\usepackage{booktabs}
+
+% Compressed itemized lists (with a * at the end)
+\usepackage{mdwlist}
+
+%% Nicer URLs.  
+\usepackage{url}
+
+%% Configure citation styles
+\usepackage[numbers,sort&compress,square]{natbib}
+\def\bibfont{\footnotesize}     %for smaller fonts in the biblio section
+
+%% Hyper Ref package. In order to operate correctly, it must be the last package declared
+\usepackage[colorlinks,pagebackref,breaklinks]{hyperref} 
+
+%% Extra package options
+\hypersetup{
+  hypertexnames=true, linkcolor=blue, anchorcolor=black,
+  citecolor=blue, urlcolor=blue  
+}
+
+\urlstyle{rm} %so it doesn't use a typewriter font for urls.
+\DeclareGraphicsExtensions{.jpg,.pdf,.mps,.png} % for pdflatex
+\graphicspath{{img/} {./}} %put all figures in these dirs
+
+\newcommand{\alert}[1]{{\color{red}\textbf{#1}}}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% ========================================================
+%% IMPORTANT store proposal information in global variables
+%% ========================================================
+\title{Full Title of the Proposal ($<$200 chars)}
+\shortname{ACRONYM} 
+\titlelogo{}{0.25} % file name and scale
+\fundingscheme{Research and Innovation Action}
+\topic{Work Programme topic addressed}
+\coordinator{Name of coordinator}{email}{fax}
+\participant{University of Coordinator}{UoC}{Country1} % First participant is the coordinator
+\participant{University of partner 2}{UoP2}{Country2} % as example...
+\participant{University of partner 3}{UoP3}{Country3} % as example...
+% etc.
+
+% Page Headers
+%\makeoddhead{proposal}{\disptoken{@acronym}}{}{\rightmark}
+%\makeevenhead{proposal}{\leftmark}{}{\disptoken{@acronym}}
+
+%Page Footers
+%\makeevenfoot{proposal}{ \thepage }{ \date{\today} }{ \disptoken{@acronym} }
+%\makeoddfoot{proposal}{  }{ \date{\today} }{ \thepage }
+
+%Page Style
+\pagestyle{proposal} %use \pagestyle{showlocs} for debugging
+
+%Heading style 
+\makeheadstyles{default}{%
+\renewcommand*{\chapnamefont}{\normalfont\bfseries}
+\renewcommand*{\chapnumfont}{\normalfont\bfseries}
+\renewcommand*{\chaptitlefont}{\normalfont\bfseries}
+\renewcommand*{\secheadstyle}{\normalfont\bfseries}
+}%
+\headstyles{default}
+
+%Chapter Style
+\chapterstyle{section} %Avoid writing the word "Chapter" at the beginning of each proposal section
+% other possible valid styles:
+% article, bringhurst, crosshead, culver, dash, demo2, ell, southall, tandh, verville, wilsondob
+\renewcommand*{\chaptitlefont}{\normalfont\Large\bfseries}
+\renewcommand*{\chapnumfont}{\normalfont\Large\bfseries}
+
+
+
+\begin{document}
+
+\instructions{\centerline{\textbf{Proposal template}}}
+\instructions{\centerline{\textbf{(Technical annex)}}}
+\vskip0.5cm
+\instructions{\centerline{\textit{\textbf{Research and Innovation actions}}}}
+\vskip0.5cm
+\instructions{\centerline{\textit{\textbf{Future and Emerging Technologies:}}}}
+\instructions{\centerline{\textit{\textbf{Call FETPROACT adn FETOPEN}}}}
+\vskip0.5cm
+\instructions{Please follow the structure of this template when preparing your proposal. It has been designed to ensure that the important aspects of your planned work are presented in a way that will enable the experts to make an effective assessment against the evaluation criteria. Sections 1, 2 and 3 each correspond to an evaluation criterion.}
+\vskip0.5cm
+\instructions{\textbf{Page limit:}}
+\vskip0.5cm
+\instructions{\textbf{The part B (cover page and sections 1, 2 and 3) is strictly limited to 16 A4 pages and shall consist of:}
+\begin{itemize}
+\item \textbf{A single A4 title page with acronym, title and abstract of the proposal.}
+\item \textbf{Maximum 15 A4 pages consisting of an S\&T section (section 1), an Impact section (section 2) and an Implementation section (section 3).}
+\end{itemize}
+}
+\vskip0.5cm
+\instructions{All tables in these sections must be included within this limit. The minimum font size allowed is 11 points.  The page size is A4, and all margins (top, bottom, left, right) should be at least 15 mm (not including any footers or headers).}
+\vskip0.5cm
+\instructions{\textbf{A proposal that does not comply with these page limits will be declared ineligible.}}
+\vskip0.5cm
+\instructions{\textit{Important remarks:}
+\begin{itemize}
+\item \textit{This strict page limitation does not apply to the other additional sections that contain information related to the description of the participating organisations and to the ethics self-assessment.}
+\item \textit{The list of the participants’ main scientific publications relevant to the proposal is to be included in section 4. Any other list of scientific publications relevant to the proposal must be included in sections 1-3, that is within the strict page limit.}
+\end{itemize}
+}
+
+%% TITLE
+\maketitle
+\instructions{
+Maximum length for Sections 1,2,3: 16 pages including all tables.\\ 
+First stage proposals have a limit of Cover page + 15 pages.\\
+Use the same participant numbering as that used in the administrative proposal forms.
+}
+
+
+\vspace{-4em}
+\renewcommand\contentsname{\normalsize Table of Contents \vspace{-4em}}
+\setlength{\cftbeforechapterskip}{1.0em plus 0.3em minus 0.1em}
+\renewcommand{\cftchapterbreak}{\addpenalty{-4000}}
+%\makeparticipantstable          %for the ICT RIA proposals
+%\tableofcontents*               %for the ICT RIA proposals
+\input{abstract}
+\thispagestyle{empty}
+\pagebreak
+
+
+
+%% Main proposal
+
+%% Fixed proposal structure - Do not change
+\input{excellence} % Section I
+\input{impact} % Section II
+\input{implementation} % Section III
+
+\bibliographystyle{plain}       %References go to end of Section III
+\bibliography{refs}
+
+\clearpage
+
+\input{members} % Section IV
+\input{ethics} % Section V
+
+\appendix
+
+\input{appendix} % Appendix
+
+\backmatter
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/h2020proposal/template-fet/wp-develop.tex b/Master/texmf-dist/doc/latex/h2020proposal/template-fet/wp-develop.tex
new file mode 100644
index 00000000000..d55d8e08257
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/h2020proposal/template-fet/wp-develop.tex
@@ -0,0 +1,96 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%  Work Package Description  %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\begin{workpackage}{DEVELOPMENT WORK PACKAGE}
+  \label{wp:develop} %change and use appropriate description
+
+  %%%%%%%%%%%%%%%%%% TOP TABLE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+  % Data for the top table
+  \wpstart{1} %Starting Month
+  \wpend{36} %End Month
+  \wptype{Activity type} %RTD, DEM, MGT, or OTHER
+
+  % Person Months per participant (required, max 7, * for leader)  
+  % syntax: \personmonths{Participant number}{value}    (not wp leader)
+  %     or  \personmonths{Participant short name}{value} (not wp leader)
+  %         \personmonths*{Participant number}{value}    (wp leader)
+  % for example:
+  \personmonths*{UoP2}{12}
+  \personmonths{UoP3}{6}
+  \personmonths{UoC}{3}
+  % etc.
+
+  \makewptable % Work package summary table
+    
+  % Work Package Objectives
+  \begin{wpobjectives}
+    This work package has the following objectives:
+    \begin{enumerate}
+    \item To develop ....
+    \item To apply this ....
+    \item etc.
+    \end{enumerate}
+  \end{wpobjectives}
+  
+  % Work Package Description
+  \begin{wpdescription}
+    % Divide work package into multiple tasks.
+    % Use \wptask command
+    % syntax: \wptask{leader}{contributors}{start-m}{end-m}{title}{description}   
+ 
+    Description of work carried out in WP, broken down into tasks, and
+    with role of partners list. Use the \texttt{\textbackslash wptask} command.
+
+    \wptask{UoC}{UoC}{1}{12}{Test}{
+      \label{task:wp2test}
+      Here we will test the WP Task code. 
+    }
+    \wptask{UoC}{UoC}{6}{9}{Integrate}{
+      \label{task:wp2integrate}
+      In this task UZH will integrate the work done in ~\ref{task:wp2test}.
+    }    
+    \wptask{UoP2}{All other}{9}{12}{Apply}{
+      Here all the WP participants will apply the results to...
+    }
+    
+    \paragraph{Role of partners}
+    \begin{description}
+    \item[Participant short name] will lead Task~\ref{task:wp2integrate}.
+    \item[UoC] will..
+    \end{description}
+  \end{wpdescription}
+  
+  % Work Package Deliverable
+  \begin{wpdeliverables}
+    % Data for the deliverables and milestones  tables
+    % syntax: \deliverable[delivery date]{nature}{dissemination
+    % level}{description} 
+    %
+    % nature: R = Report, P = Prototype, D = Demonstrator, O = Other
+    % dissemination level: PU = Public, PP = Restricted to other
+    % programme participants (including the Commission Services), RE =
+    % Restricted to a group specified by the consortium (including the
+    % Commission Services), CO = Confidential, only for members of the
+    % consortium (including the Commission Services).
+    % 
+    % \wpdeliverable[date]{R}{PU}{A report on \ldots}
+
+    \wpdeliverable[36]{UoC}{R}{PU}{Report on the definition of the model
+      specifications.}\label{dev:wp2specs}
+    
+    \wpdeliverable[12]{UoP3}{R}{PU}{Report on Feasibility study for the model
+      implementation.}\label{dev:wp2implementation}
+
+    \wpdeliverable[24]{UoP2}{R}{PU}{Prototype of model
+      implementation.}\label{dev:wp2prototype}
+
+  \end{wpdeliverables}
+
+\end{workpackage}
+
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: "proposal-main"
+%%% End:
diff --git a/Master/texmf-dist/doc/latex/h2020proposal/template-fet/wp-management.tex b/Master/texmf-dist/doc/latex/h2020proposal/template-fet/wp-management.tex
new file mode 100644
index 00000000000..48aaf7f10aa
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/h2020proposal/template-fet/wp-management.tex
@@ -0,0 +1,96 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%  Work Package Description  %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\begin{workpackage}{MANAGEMENT  WORK PACKAGE}
+  \label{wp:management} %change and use appropriate description
+
+  %%%%%%%%%%%%%%%%%% TOP TABLE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+  % Data for the top table
+  \wpstart{1} %Starting Month
+  \wpend{36} %End Month
+  \wptype{Activity type} %RTD, DEM, MGT, or OTHER
+
+  % Person Months per participant (required, max 7, * for leader)  
+  % syntax: \personmonths{Participant number}{value}    (not wp leader)
+  %     or  \personmonths{Participant short name}{value} (not wp leader)
+  %         \personmonths*{Participant number}{value}    (wp leader)
+  % for example:
+  \personmonths*{UoC}{12}
+  \personmonths{UoP2}{3}
+  \personmonths{UoP3}{2}
+  % etc.
+
+  \makewptable % Work package summary table
+    
+  % Work Package Objectives
+  \begin{wpobjectives}
+    This work package has the following objectives:
+    \begin{enumerate}
+    \item To develop ....
+    \item To apply this ....
+    \item etc.
+    \end{enumerate}
+  \end{wpobjectives}
+  
+  % Work Package Description
+  \begin{wpdescription}
+    % Divide work package into multiple tasks.
+    % Use \wptask command
+    % syntax: \wptask{leader}{contributors}{start-m}{end-m}{title}{description}   
+ 
+    Description of work carried out in WP, broken down into tasks, and
+    with role of partners list. Use the \texttt{\textbackslash wptask} command.
+
+    \wptask{UoC}{UoC}{1}{12}{Test}{
+      \label{task:wp1test}
+      Here we will test the WP Task code. 
+    }
+    \wptask{UoC}{UoC}{6}{9}{Integrate}{
+      \label{task:wp1integrate}
+      In this task UZH will integrate the work done in ~\ref{task:wp1test}.
+    }    
+    \wptask{UoP3}{All other}{9}{12}{Apply}{
+      Here all the WP participants will apply the results to...
+    }
+    
+    \paragraph{Role of partners}
+    \begin{description}
+    \item[Participant short name] will lead Task~\ref{task:wp1integrate}.
+    \item[UoC] will..
+    \end{description}
+  \end{wpdescription}
+  
+  % Work Package Deliverable
+  \begin{wpdeliverables}
+    % Data for the deliverables and milestones  tables
+    % syntax: \deliverable[delivery date]{nature}{dissemination
+    % level}{description} 
+    %
+    % nature: R = Report, P = Prototype, D = Demonstrator, O = Other
+    % dissemination level: PU = Public, PP = Restricted to other
+    % programme participants (including the Commission Services), RE =
+    % Restricted to a group specified by the consortium (including the
+    % Commission Services), CO = Confidential, only for members of the
+    % consortium (including the Commission Services).
+    % 
+    % \wpdeliverable[date]{R}{PU}{A report on \ldots}
+
+    \wpdeliverable[36]{UoC}{R}{PU}{Report on the definition of the model
+      specifications.}\label{dev:wp1specs}
+    
+    \wpdeliverable[12]{UoP3}{R}{PU}{Report on Feasibility study for the model
+      implementation.}\label{dev:wp1implementation}
+
+    \wpdeliverable[24]{UoP2}{R}{PU}{Prototype of model
+      implementation.}\label{dev:wp1prototype}
+
+  \end{wpdeliverables}
+
+\end{workpackage}
+
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: "proposal-main"
+%%% End:
diff --git a/Master/texmf-dist/doc/latex/h2020proposal/template-fet/wp-test.tex b/Master/texmf-dist/doc/latex/h2020proposal/template-fet/wp-test.tex
new file mode 100644
index 00000000000..693683c1cd6
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/h2020proposal/template-fet/wp-test.tex
@@ -0,0 +1,96 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%  Work Package Description  %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\begin{workpackage}{TEST WORK PACKAGE}
+  \label{wp:test} %change and use appropriate description
+
+  %%%%%%%%%%%%%%%%%% TOP TABLE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+  % Data for the top table
+  \wpstart{1} %Starting Month
+  \wpend{36} %End Month
+  \wptype{Activity type} %RTD, DEM, MGT, or OTHER
+
+  % Person Months per participant (required, max 7, * for leader)  
+  % syntax: \personmonths{Participant number}{value}    (not wp leader)
+  %     or  \personmonths{Participant short name}{value} (not wp leader)
+  %         \personmonths*{Participant number}{value}    (wp leader)
+  % for example:
+  \personmonths{UoP2}{8}
+  \personmonths*{UoP3}{12}
+  \personmonths{UoC}{3}
+  % etc.
+
+  \makewptable % Work package summary table
+    
+  % Work Package Objectives
+  \begin{wpobjectives}
+    This work package has the following objectives:
+    \begin{enumerate*}
+    \item To develop ....
+    \item To apply this ....
+    \item etc.
+    \end{enumerate*}
+  \end{wpobjectives}
+  
+  % Work Package Description
+  \begin{wpdescription}
+    % Divide work package into multiple tasks.
+    % Use \wptask command
+    % syntax: \wptask{leader}{contributors}{start-m}{end-m}{title}{description}   
+ 
+    Description of work carried out in WP, broken down into tasks, and
+    with role of partners list. Use the \texttt{\textbackslash wptask} command.
+
+    \wptask{UoC}{UoC}{1}{12}{Test}{
+      \label{task:wp3test}
+      Here we will test the WP Task code. 
+    }
+    \wptask{UoC}{UoC}{6}{9}{Integrate}{
+      \label{task:wp3integrate}
+      In this task UZH will integrate the work done in ~\ref{task:wp3test}.
+    }    
+    \wptask{UoP3}{All other}{9}{12}{Apply}{
+      Here all the WP participants will apply the results to...
+    }
+    
+    \paragraph{Role of partners}
+    \begin{description*}
+    \item[Participant short name] will lead Task~\ref{task:wp3integrate}.
+    \item[UoC] will..
+    \end{description*}
+  \end{wpdescription}
+  
+  % Work Package Deliverable
+  \begin{wpdeliverables}
+    % Data for the deliverables and milestones  tables
+    % syntax: \deliverable[delivery date]{nature}{dissemination
+    % level}{description} 
+    %
+    % nature: R = Report, P = Prototype, D = Demonstrator, O = Other
+    % dissemination level: PU = Public, PP = Restricted to other
+    % programme participants (including the Commission Services), RE =
+    % Restricted to a group specified by the consortium (including the
+    % Commission Services), CO = Confidential, only for members of the
+    % consortium (including the Commission Services).
+    % 
+    % \wpdeliverable[date]{R}{PU}{A report on \ldots}
+
+    \wpdeliverable[36]{UoC}{R}{PU}{Report on the definition of the model
+      specifications.}\label{dev:wp3specs}
+    
+    \wpdeliverable[12]{UoP3}{R}{PU}{Report on Feasibility study for the model
+      implementation.}\label{dev:wp3implementation}
+
+    \wpdeliverable[24]{UoP2}{R}{PU}{Prototype of model
+      implementation.}\label{dev:wp3prototype}
+
+  \end{wpdeliverables}
+
+\end{workpackage}
+
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: "proposal-main"
+%%% End:
diff --git a/Master/texmf-dist/doc/latex/h2020proposal/template-ict/abstract.tex b/Master/texmf-dist/doc/latex/h2020proposal/template-ict/abstract.tex
new file mode 100644
index 00000000000..93417be38e6
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/h2020proposal/template-ict/abstract.tex
@@ -0,0 +1,3 @@
+\begin{abstract}
+  Project abstract. \textbf{Important:} limit to 2000 characters. 
+\end{abstract}
diff --git a/Master/texmf-dist/doc/latex/h2020proposal/template-ict/appendix.tex b/Master/texmf-dist/doc/latex/h2020proposal/template-ict/appendix.tex
new file mode 100644
index 00000000000..e493fa0bfec
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/h2020proposal/template-ict/appendix.tex
@@ -0,0 +1,2 @@
+%% Proposal appendix
+
diff --git a/Master/texmf-dist/doc/latex/h2020proposal/template-ict/ethics.tex b/Master/texmf-dist/doc/latex/h2020proposal/template-ict/ethics.tex
new file mode 100644
index 00000000000..743e270eadb
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/h2020proposal/template-ict/ethics.tex
@@ -0,0 +1,43 @@
+\chapter{Ethics and Security}
+\label{cha:ethics}
+\instructions{
+\textit{This section is not covered by the page limit.}
+}
+
+\section{Ethics}
+\label{sec:ethics}
+\instructions{
+If you have entered any ethics issues in the ethical issue table in the administrative proposal forms, you must:
+\begin{itemize}
+\item submit an ethics self-assessment, which:
+\begin{itemize}
+\item describes how the proposal meets the national legal and ethical requirements of the country or countries where the tasks raising ethical issues are to be carried out; 
+\item explains in detail how you intend to address the issues in the ethical issues table, in particular as regard:
+\begin{itemize}
+\item research objectives (e.g. study of vulnerable populations, dual use, etc.)
+\item research methodology (e.g. clinical trials, involvement of children and related consent procedures, protection of any data collected, etc.) 
+\item the potential impact of the research (e.g. dual use issues, environmental damage, stigmatisation of particular social groups, political or financial retaliation, benefit-sharing,  malevolent use, etc.).
+\end{itemize}
+\end{itemize}
+\item provide the documents that you need under national law(if you already have them), e.g.:
+\begin{itemize}
+\item an ethics committee opinion;
+\item the document notifying activities raising ethical issues or authorising such activities;
+\end{itemize}
+\end{itemize}
+\textit{\indent If these documents are not in English, you must also submit an English summary of them (containing, if available, the conclusions of the committee or authority concerned).}
+\vskip0.2cm
+\textit{If you plan to request these documents specifically for the project you are proposing, your request must contain an explicit reference to the project title.}
+}
+
+\section{Security}\footnote{Article 37.1 of the Model Grant Agreement: Before disclosing results of activities raising security issues to a third party (including affiliated entities), a beneficiary must inform the coordinator -- which must request written approval from the Commission/Agency. Article 37.2: Activities related to ``classified deliverables'' must comply with the ``security requirements'' until they are declassified. Action tasks related to classified deliverables may not be subcontracted without prior explicit written approval from the Commission/Agency. The beneficiaries must inform the coordinator -- which must immediately inform the Commission/Agency -- of
+any changes in the security context and --if necessary -- request for Annex 1 to be amended (see Article 55).
+}
+\label{sec:security}
+\instructions{
+Please indicate if your project will involve:
+\begin{itemize}
+\item activities or results raising security issues: (YES/NO)
+\item ``EU-classified information'' as background or results: (YES/NO)
+\end{itemize}
+}
diff --git a/Master/texmf-dist/doc/latex/h2020proposal/template-ict/excellence.tex b/Master/texmf-dist/doc/latex/h2020proposal/template-ict/excellence.tex
new file mode 100644
index 00000000000..65b32f8d40f
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/h2020proposal/template-ict/excellence.tex
@@ -0,0 +1,52 @@
+%%% Important. To have correct table numberings
+\renewcommand{\thetable}{\thesection\alph{table}}
+
+\chapter[Excellence]{Excellence}
+\label{cha:excellence}
+\instructions{
+Your proposal must address a work programme topic for this call for proposals. \\
+\textit{This section of your proposal will be assessed only to the extent that it is relevant to that topic.}\\
+}
+
+\section{Objectives}
+\label{sec:objectives}
+\instructions{
+\begin{itemize}
+\item Describe the specific objectives for the project\footnote{The term ‘project’ used in this template equates to an ‘action’ in certain other Horizon 2020 documentation.}, which should be clear, measurable, realistic and achievable within the duration of the project. Objectives should be consistent with the expected exploitation and impact of the project (see section 2). 
+\end{itemize}
+}
+
+
+
+\section{Relation to the work programme}
+\label{sec:relation-to-work-programme}
+\instructions{
+\begin{itemize}
+\item Indicate the work programme topic to which your proposal relates, and explain how your proposal addresses the specific challenge and scope of that topic, as set out in the work programme.
+\end{itemize}
+}
+
+
+\section{Concept and approach}
+\label{sec:concept}
+\instructions{
+\begin{itemize}
+\item Describe and explain the overall concept underpinning the project. Describe the main ideas, models or assumptions involved. Identify any trans-disciplinary considerations;\\
+\item Describe the positioning of the project e.g. where it is situated in the spectrum from idea to application, or from ``lab to market''. Refer to Technology Readiness Levels where relevant. (See General Annex G of the work programme);\\
+\item Describe any national or international research and innovation activities which will be linked with the project, especially where the outputs from these will feed into the project;\\
+\item Describe and explain the overall approach and methodology, distinguishing, as appropriate, activities indicated in the relevant section of the work programme, e.g. for research, demonstration, piloting, first market replication, etc;\\
+\item Where relevant, describe how sex and/or gender analysis is taken into account in the project's content.
+\end{itemize}
+\emph{Sex and gender refer to biological characteristics and social/cultural factors respectively. For guidance
+on methods of sex / gender analysis and the issues to be taken into account, please refer to
+http://ec.europa.eu/research/science-society/gendered-innovations/index\_en.cfm}
+}
+
+\section{Ambition}
+\label{sec:ambition}
+\instructions{
+\begin{itemize}
+\item Describe the advance your proposal would provide beyond the state-of-the-art, and the extent the proposed work is ambitious. Your answer could refer to the ground-breaking nature of the objectives, concepts involved, issues and problems to be addressed, and approaches and methods to be used.\\
+\item Describe the innovation potential which the proposal represents. Where relevant, refer to products and services already available on the market. Please refer to the results of any patent search carried out.\\
+\end{itemize}
+}
diff --git a/Master/texmf-dist/doc/latex/h2020proposal/template-ict/gantt.tex b/Master/texmf-dist/doc/latex/h2020proposal/template-ict/gantt.tex
new file mode 100644
index 00000000000..b76534ab923
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/h2020proposal/template-ict/gantt.tex
@@ -0,0 +1,42 @@
+%project Gantt chart
+
+
+\begin{figure}
+  \centering
+
+  \begin{ganttchart}%
+    [
+    x unit = 0.25cm,
+    y unit title=0.4cm,
+    y unit chart=0.4cm,
+    vgrid,
+    title/.style={draw=black!50, fill=green!50!black},
+    title label font=\sffamily\bfseries\color{white},
+    title label anchor/.style={below=-1.6ex},
+    title left shift=.05,
+    title right shift=-.05,
+    title height=1,
+    bar/.style={draw=none, fill=blue!75},
+    bar height=.6,
+    bar label font=\small\color{black!50},
+    milestone label font=\small\color{red!50},
+    group right shift=0,
+    group top shift=.6,
+    group height=.3,
+    group peaks={}{}{.2},
+    incomplete/.style={fill=red}]{60}
+    
+    \gantttitle{ACRONYM}{60} \\
+    \gantttitle{Year 1}{12} 
+    \gantttitle{Year 2}{12} 
+    \gantttitle{Year 3}{12}  
+    \gantttitle{Year 4}{12}  
+    \gantttitle{Year 5}{12} \\ 
+    
+    \ganttchartdata % data generated by the ICTProposal.cls
+    
+  \end{ganttchart}
+
+  \caption[Gantt chart]{Project Gantt chart.}
+  \label{fig:gantt}
+\end{figure}
diff --git a/Master/texmf-dist/doc/latex/h2020proposal/template-ict/impact.tex b/Master/texmf-dist/doc/latex/h2020proposal/template-ict/impact.tex
new file mode 100644
index 00000000000..fc5863e2cd0
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/h2020proposal/template-ict/impact.tex
@@ -0,0 +1,52 @@
+\chapter{Impact}
+\label{cha:impact}
+
+
+\section{Expected impact} 
+\label{sec:expected-impact}
+\instructions{
+\textit{Please be specific, and provide only information that applies to the proposal and its objectives. Wherever possible, use quantified indicators and targets.}\\
+\begin{itemize}
+\item Describe how your project will contribute to:
+\begin{itemize}
+\item the expected impacts set out in the work programme under the relevant topic. 
+\item improving innovation capacity and the integration of new knowledge (strengthening the competitiveness and growth of companies by developing innovations meeting the needs of European and global markets; and, where relevant, by delivering such innovations to the markets;\\
+\item any other environmental and socially important impacts (if not already covered above).
+\end{itemize}
+\item Describe any barriers/obstacles, and any framework conditions (such as regulation and standards), that may determine whether and to what extent the expected impacts will be achieved. (This should not include any risk factors concerning implementation, as covered in section 3.2.) 
+\end{itemize}
+}
+
+\section{Measures to maximize impact} 
+\label{sec:maximize-impact}
+
+\subsection{Dissemination and exploitation of results}
+\label{sec:dissemination-exploitation}
+\instructions{
+\begin{itemize}
+\item Provide a draft ``plan for the dissemination and exploitation of the project's results'' (unless the work programme topic explicitly states that such a plan is not required). For innovation actions describe a credible path to deliver the innovations to the market. The plan, which should be proportionate to the scale of the project, should contain measures to be implemented both during and after the project.\\ 
+\emph{Dissemination and exploitation measures should address the full range of potential users and uses including research, commercial, investment, social, environmental, policy making, setting standards, skills and educational training.\\
+The approach to innovation should be as comprehensive as possible, and must be tailored to the specific technical, market and organisational issues to be addressed.}\\
+\item Explain how the proposed measures will help to achieve the expected impact of the project. Include a business plan where relevant.\\
+\item Where relevant, include information on how the participants will manage the research data generated and/or collected during the project, in particular addressing the following issues:\footnote{For further guidance on research data management, please refer to the H2020 Online Manual on the Participant Portal.}
+\begin{itemize}
+\item What types of data will the project generate/collect?
+\item What standards will be used?
+\item How will this data be exploited and/or shared/made accessible for verification and re-use? If data cannot be made available, explain why.
+\item How will this data be curated and preserved?
+\end{itemize}
+\emph{You will need an appropriate consortium agreement to manage (amongst other things) the ownership and access to key knowledge (IPR, data etc.). Where relevant, these will allow you, collectively and individually, to pursue market opportunities arising from the project's results.} \\
+\emph{The appropriate structure of the consortium to support exploitation is addressed in section 3.3.}\\
+\item Outline the strategy for knowledge management and protection. Include measures to provide open access (free on-line access, such as the ``green'' or ``gold'' model) to peer-reviewed scientific publications which might result from the project\footnote{Open access must be granted to all scientific publications resulting from Horizon 2020 actions. Further guidance on open access is available in the H2020 Online Manual on the Participant Portal.}.\\
+\emph{Open access publishing (also called 'gold' open access) means that an article is immediately provided in open access mode by the scientific publisher. The associated costs are usually shifted away from readers, and instead (for example) to the university or research institute to which the researcher is affiliated, or to the funding agency supporting the research.}\\
+\emph{Self-archiving (also called 'green' open access) means that the published article or the final peer-reviewed manuscript is archived by the researcher - or a representative - in an online repository before, after or alongside its publication. Access to this article is often - but not necessarily - delayed (``embargo period''), as some scientific publishers may wish to recoup their investment by selling subscriptions and charging pay-per-download/view fees during an exclusivity period.}
+\end{itemize}
+}
+
+\subsection{Communication activities}
+\label{sec:communication}
+\instructions{
+\begin{itemize}
+\item Describe the proposed communication measures for promoting the project and its findings during the period of the grant. Measures should be proportionate to the scale of the project, with clear objectives. They should be tailored to the needs of various audiences, including groups beyond the project's own community. Where relevant, include measures for public/societal engagement on issues related to the project. 
+\end{itemize}
+}
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/h2020proposal/template-ict/implementation.pdf b/Master/texmf-dist/doc/latex/h2020proposal/template-ict/implementation.pdf
new file mode 100644
index 00000000000..0d7ec5df345
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/h2020proposal/template-ict/implementation.pdf
diff --git a/Master/texmf-dist/doc/latex/h2020proposal/template-ict/implementation.tex b/Master/texmf-dist/doc/latex/h2020proposal/template-ict/implementation.tex
new file mode 100644
index 00000000000..3b247abc8e0
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/h2020proposal/template-ict/implementation.tex
@@ -0,0 +1,171 @@
+\chapter{Implementation}
+\label{cha:implementation}
+
+\section{Work plan -- Work packages, deliverables, and milestones} 
+\label{sec:work-plan}
+\instructions{
+Please provide the following:
+\begin{itemize}
+\item brief presentation of the overall structure of the work plan;
+\item timing of the different work packages and their components (Gantt chart or similar);
+\item detailed work description, i.e.:
+\begin{itemize}
+\item a description of each work package (table 3.1a);
+\item a list of work packages (table 3.1b);
+\item a list of major deliverables (table 3.1c);
+\end{itemize}
+\item graphical presentation of the components showing how they inter-relate (Pert chart or similar).
+\end{itemize}
+\vskip0.2cm
+\emph{\indent Give full details. Base your account on the logical structure of the project and the stages in which it is to be carried out. Include details of the resources to be allocated to each work package. The number of work packages should be proportionate to the scale and complexity of the project.}
+\vskip0.2cm
+\emph{You should give enough detail in each work package to justify the proposed resources to be allocated and also quantified information so that progress can be monitored, including by the Commission.}
+\vskip0.2cm
+\emph{You are advised to include a distinct work package on ``management'' (see section 3.2) and to give due visibility in the work plan to ``dissemination and exploitation'' and ``communication activities'', either with distinct tasks or distinct work packages.}
+\vskip0.2cm
+\emph{You will be required to include an updated (or confirmed) ``plan for the dissemination and exploitation of results'' in both the periodic and final reports. (This does not apply to topics where a draft plan was not required.) This should include a record of activities related to dissemination and exploitation that have been undertaken and those still planned. A report of completed and planned communication activities will also be required.}
+\vskip0.2cm
+\emph{If your project is taking part in the Pilot on Open Research Data\footnote{Certain actions under Horizon 2020 participate in the 'Pilot on Open Research Data in Horizon 2020'. All other actions can participate on a voluntary basis to this pilot.  Further guidance is available in the H2020 Online Manual on the Participant Portal.}, you must include a 'data management plan' as a distinct deliverable within the first 6 months of the project. A template for such a plan is given in the guidelines on data management in the H2020 Online Manual. This deliverable will evolve during the lifetime of the project in order to present the status of the project's reflections on data management.}
+\vskip0.2cm
+\emph{\noindent \textbf{Definitions:}}
+\vskip0.2cm
+\emph{\ul{``Work package''} means a major sub-division of the proposed project.}
+\vskip0.2cm
+\emph{\ul{``Deliverable''} means a distinct output of the project, meaningful in terms of the project's overall objectives and constituted by a report, a document, a technical diagram, a software etc.}
+\vskip0.2cm
+\emph{\ul{``Milestones''} means control points in the project that help to chart progress. Milestones may correspond to the completion of a key deliverable, allowing the next phase of the work to begin. They may also be needed at intermediary points so that, if problems have arisen, corrective measures can be taken. A milestone may be a critical decision point in the project where, for example, the consortium must decide which of several technologies to adopt for further development.}
+\vskip0.2cm
+\emph{\noindent Report on work progress is done primarily through the periodic and final reports. Deliverables should complement these reports and should be kept to the minimum necessary.}
+}
+
+% Gantt chart in latex (requires pfggantt.sty file)
+%\include{gantt}
+
+\subsection{Work package description}
+\label{sec:wps}
+
+%Include work-packages as separate files
+\input{wp-management}             %Use \input for first WP
+\include{wp-develop}
+\include{wp-test}
+
+\subsection{List of work packages}
+\label{sec:wplist}
+\makewplist
+
+\subsection{List of deliverables}
+\label{sec:deliverables}
+\instructions{List of deliverables\footnote{If your action taking part in the Pilot on Open Research Data, you must include a data management plan as a distinct deliverable within the first 6 months of the project. This deliverable will evolve during the lifetime of the project in order to present the status of the project's reflections on data management. A template for such a plan is available on the Participant Portal (Guide on Data Management).}}
+
+\instructions{
+\textbf{KEY}\\
+\emph{Deliverable numbers in order of delivery dates. Please use the numbering convention $<$WP number$>.<$number of deliverable within that WP$>$.}
+\vskip0.2cm
+\noindent\emph{For example, deliverable 4.2 would be the second deliverable from work package 4.}
+\vskip0.2cm
+\noindent\textbf{Type:}\\
+\emph{Use one of the following codes:}\\
+\indent R: Document, report (excluding the periodic and final reports)\\
+\indent DEM: Demonstrator, pilot, prototype, plan designs\\
+\indent DEC: Websites, patents filing, press \& media actions, videos, etc.\\
+\indent OTHER: Software, technical diagram, etc.
+\vskip0.2cm
+\noindent\textbf{Dissemination level}:\\
+\emph{Use one of the following codes:}\\
+\indent PU = Public, fully open, e.g. web\\
+\indent CO = Confidential, restricted under conditions set out in Model Grant Agreement\\
+\indent CI = Classified, information as referred to in Commission Decision 2001/844/EC.\\
+\vskip0.2cm
+\noindent\textbf{Delivery date}:\\
+Measured in months from the project start date (month 1).
+}
+\makedeliverablelist
+
+
+\section{Management structure and procedures}
+\label{sec:management}
+\setcounter{table}{0}
+\instructions{
+\begin{itemize}
+\item Describe the organisational structure and the decision-making ( including a list of milestones (table 3.2a))
+\item Explain why the organisational structure and decision-making mechanisms are appropriate to the complexity and scale of the project.
+\item Describe, where relevant, how effective innovation management will be addressed in the management structure and work plan.\\
+\emph{Innovation management is a process which requires an understanding of both market and technical problems, with a goal of successfully implementing appropriate creative ideas. A new or improved product, service or process is its typical output. It also allows a consortium to respond to an external or internal opportunity.}\\
+\item Describe any critical risks, relating to project implementation, that the stated project's objectives may not be achieved. Detail any risk mitigation measures. Please provide a table with critical risks identified and mitigating actions (table 3.2b)
+\end{itemize}
+}
+
+\subsection{List of milestones}
+\label{sec:milestones}
+\instructions{
+\vskip0.2cm
+\noindent\textbf{KEY}\\
+\textbf{Estimated date}\\
+\emph{Measured in months from the project start date (month 1)}
+\vskip0.2cm
+\noindent\textbf{Means of verification}\\
+\emph{Show how you will confirm that the milestone has been attained. Refer to indicators if appropriate. For example: a laboratory prototype that is ‘up and running’; software released and validated by a user group; field survey complete and data quality validated.}}
+
+\milestone[24]{Completed simulator development}{Software released and
+  validated}{1}
+\milestone[36]{Final demonstration}{Application of results}{WP\,\ref{wp:test}}
+
+\makemilestoneslist
+
+\subsection{Critical risks for implementation}
+\label{sec:risks}
+
+\criticalrisk{The dedicated chip sent to fabrication is not functional.}{WP\,\ref{wp:test}}{Resort to Software simulations}
+
+\makerisklist
+
+\section{Consortium as a whole} 
+\label{sec:consortium}
+\instructions{
+\emph{The individual members of the consortium are described in a separate section 4. There is no need to repeat that information here.}
+\begin{itemize}
+\item Describe the consortium. How will it match the project’s objectives? How do the members complement one another (and cover the value chain, where appropriate)? In what way does each of them contribute to the project? How will they be able to work effectively together? 
+\item If applicable, describe the industrial/commercial involvement in the project to ensure exploitation of the results and explain why this is consistent with and will help to achieve the specific measures which are proposed for exploitation of the results of the project (see section 2.2).\\
+\item \textbf{Other countries:} If one or more of the participants requesting EU funding is based in a country that is not automatically eligible for such funding (entities from Member States of the EU, from Associated Countries and from one of the countries in the exhaustive list included in General Annex A of the work programme are automatically eligible for EU funding), explain why the participation of the entity in question is essential to carrying out the project. 
+\end{itemize}
+}
+
+\section{Resources to be committed} 
+\label{sec:resources}
+\setcounter{table}{0}
+\instructions{
+\emph{Please make sure the information in this section matches the costs as stated in the budget table in section 3 of the administrative proposal forms, and the number of person/months, shown in the detailed work package descriptions.}
+\vskip0.2cm
+Please provide the following:\\
+\begin{itemize}
+\item a table showing number of person/months required (table 3.4a)
+\item a table showing ``other direct costs'' (table 3.4b) for participants where those costs exceed 15\% of the personnel costs (according to the budget table in section 3 of the administrative proposal forms)  
+\end{itemize}
+}
+
+\subsection{Summary of staff efforts}
+\instructions{Table 3.4a: \emph{Please indicate the number of person/months over the whole duration of the planned work, for each work package, for each participant. Identify the work-package leader for each WP by showing the relevant person-month figure in bold.}}
+\makesummaryofefforttable
+
+\subsection{‘Other direct cost’ items (travel, equipment, other goods and services, large research infrastructure)}
+\instructions{
+Please provide a table of summary of costs for each participant, if the sum of the costs for ``travel'', ``equipment'', and ``goods and services'' exceeds 15\% of the personnel costs for that participant (according to the budget table in section 3 of the proposal administrative forms).
+}
+
+\costsTravel{UoC}{2500}{3 pairwise meetings for 2 people, 2 conferences for 3 people, 3 internal project meetings for 3 people}
+\costsEquipment{UoC}{3000}{CAD workstation for chip design}
+\costsOther{UoC}{60000}{Fabrication of 2 VLSI chips}
+\costsOther{UoP2}{40000}{Fabrication of prototype PCBs}
+
+\makecoststable
+
+
+\instructions{
+Please complete the table below for all participants that would like to declare costs of large research infrastructure under Article 6.2 of the General Model Agreement, irrespective of the percentage of personnel costs. Please indicate (in the justification) if the beneficiary's methodology for declaring the costs for large research infrastructure has already been positively assessed by the Commission.\\
+Note: Large research infrastructure means research infrastructure of a total value of at least EUR 20 million, for a beneficiary. More information and further guidance on the direct costing for the large research infrastructure is available in the H2020 Online Manual on the Participant Portal.
+}
+
+\costslri{UoP3}{400000}{Synchrotron}
+\costslri{UoC}{400000}{Synchrotron}
+
+\makelritable
diff --git a/Master/texmf-dist/doc/latex/h2020proposal/template-ict/members.tex b/Master/texmf-dist/doc/latex/h2020proposal/template-ict/members.tex
new file mode 100644
index 00000000000..f2dbd1c87be
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/h2020proposal/template-ict/members.tex
@@ -0,0 +1,82 @@
+\chapter{Members of the consortium}
+\label{cha:members}
+
+\instructions{
+\textit{This section is not covered by the page limit.}
+\vskip0.2cm
+\textit{The information provided here will be used to judge the operational capacity.}
+}
+
+\section{Participants (applicants)}
+\label{sec:participants}
+
+\instructions{
+Please provide, for each participant, the following (if available):\\
+\begin{itemize}
+\item a description of the legal entity and its main tasks, with an explanation of how its profile matches the tasks in the proposal;
+\item a curriculum vitae or description of the profile of the persons, including their gender, who will be primarily responsible for carrying out the proposed research and/or innovation activities;
+\item a list of up to 5 relevant publications, and/or products, services (including widely-used datasets or software), or other achievements relevant to the call content;
+\item a list of up to 5 relevant previous projects or activities, connected to the subject of this proposal;
+\item a description of any significant infrastructure and/or any major items of technical equipment, relevant to the proposed work;
+\item any other supporting documents specified in the work programme for this call.
+\end{itemize}
+}
+
+\section{Third parties involved in the project (including use of third party resources)}
+\label{sec:third-parties}
+
+\instructions{
+\textit{Please complete, for each participant, the following table (or simply state "No third parties involved", if applicable).} \\
+If yes in first row, please describe and justify the tasks to be subcontracted. If yes in second row, please describe the third party, the link of the participant to the third party, and describe and justify the foreseen tasks to be performed by the third party\footnote{A third party that is an affiliated entity or has a legal link to a participant implying a collaboration not limited to the action. (Article 14 of the Model Grant Agreement).}. If yes in third row, please describe the third party and their contributions.}
+
+\begin{tabular}{|p{.85\textwidth}|p{.05\textwidth}|}
+  \hline  
+  \multicolumn{2}{|l|}{\cellcolor[gray]{0.8}\textbf{UoC}}\\
+  \hline
+  Does the participant plan to subcontract certain tasks (please note that core tasks of the project should not be sub-contracted) &
+  \textbf{Y/N} \\
+  \hline
+Does the participant envisage that part of its work is performed by linked
+third parties &
+  \textbf{Y/N} \\
+  \hline
+  Does the participant envisage the use of contributions in kind provided by
+third parties (Articles 11 and 12 of the General Model Grant Agreement) &
+  \textbf{Y/N}\\
+  \hline
+\end{tabular}
+
+\begin{tabular}{|p{.85\textwidth}|p{.05\textwidth}|}
+  \hline  
+  \multicolumn{2}{|l|}{\cellcolor[gray]{0.8}\textbf{UoP1}}\\
+  \hline
+  Does the participant plan to subcontract certain tasks (please note that core tasks of the project should not be sub-contracted) &
+  \textbf{Y/N} \\
+  \hline
+Does the participant envisage that part of its work is performed by linked
+third parties &
+  \textbf{Y/N} \\
+  \hline
+  Does the participant envisage the use of contributions in kind provided by
+third parties (Articles 11 and 12 of the General Model Grant Agreement) &
+  \textbf{Y/N}\\
+  \hline
+\end{tabular}
+
+
+\begin{tabular}{|p{.85\textwidth}|p{.05\textwidth}|}
+  \hline  
+  \multicolumn{2}{|l|}{\cellcolor[gray]{0.8}\textbf{UoP2}}\\
+  \hline
+  Does the participant plan to subcontract certain tasks (please note that core tasks of the project should not be sub-contracted) &
+  \textbf{Y/N} \\
+  \hline
+Does the participant envisage that part of its work is performed by linked
+third parties &
+  \textbf{Y/N} \\
+  \hline
+  Does the participant envisage the use of contributions in kind provided by
+third parties (Articles 11 and 12 of the General Model Grant Agreement) &
+  \textbf{Y/N}\\
+  \hline
+\end{tabular}
diff --git a/Master/texmf-dist/doc/latex/h2020proposal/template-ict/template-ict.pdf b/Master/texmf-dist/doc/latex/h2020proposal/template-ict/template-ict.pdf
new file mode 100644
index 00000000000..0d08081720d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/h2020proposal/template-ict/template-ict.pdf
diff --git a/Master/texmf-dist/doc/latex/h2020proposal/template-ict/template-ict.tex b/Master/texmf-dist/doc/latex/h2020proposal/template-ict/template-ict.tex
new file mode 100644
index 00000000000..9b41689a891
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/h2020proposal/template-ict/template-ict.tex
@@ -0,0 +1,230 @@
+%% EU ICT Proposal LaTeX template
+%% V1.0
+%% Based on the h2020proposal.cls LaTeX class for writing EU H2020 RIA proposals.
+%% 
+%% Copyright (c) 2010, Giacomo Indiveri
+%%
+%%  This latex class is free software: you can redistribute it and/or modify
+%%  it under the terms of the GNU General Public License as published by
+%%  the Free Software Foundation, either version 3 of the License, or
+%%  (at your option) any later version.
+%%
+%%  h2020proposal.cls is distributed in the hope that it will be useful,
+%%  but WITHOUT ANY WARRANTY; without even the implied warranty of
+%%  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+%%  GNU General Public License for more details.
+%%
+%%  You should have received a copy of the GNU General Public License
+%%  along with h2020proposal.cls.  If not, see <http://www.gnu.org/licenses/>.
+%%
+%% Contributors: Elisabetta Chicca
+%%
+%% Disclaimer: The template is based on the document provided by the EU Participants Portal 
+%% h2020-call-pt-ria-ia_en, Version 1.4, 21 May 201
+%%
+%% Use the original source and the http://ec.europa.eu/ documentation for reference. We make no
+%% representations or warranties of any kind, express or implied, about the completeness, accuracy,
+%% reliability, suitability or availability with respect to the original template.
+%% In no event will we be liable for any loss or damage including without limitation, indirect or
+%% consequential loss or damage, or any loss or damage whatsoever arising out of, or in connection
+%% with, the use of this template and/or class.
+%%
+%% Makes use of the memoir class. Read the optimum memman documentation for
+%% info on how to customize your proposal.
+
+
+%\documentclass[]{h2020proposal}     % Remove 'draft' option for final version
+\documentclass[draft]{h2020proposal} % Use 'draft' option to show comments and labels
+
+% For in-line comments use:
+% \marginpar{comment text}
+
+%% Extra Packages
+%% ========
+%\usepackage{fontspec}% Latin Modern by default with xelatex
+
+%% LaTeX Font encoding -- DO NOT CHANGE
+\usepackage[OT1]{fontenc}
+
+%% Input encoding 'utf8'. In some cases you might need 'utf8x' for
+%% extra symbols. Not all editors, especially on Windows, are UTF-8
+%% capable, so you may want to use 'latin1' instead.
+%\usepackage[utf8,latin1]{inputenc}
+
+%% Babel provides support for languages.  'english' uses British
+%% English hyphenation and text snippets like "Figure" and
+%% "Theorem". Use the option 'ngerman' if your document is in German.
+%% Use 'american' for American English.  Note that if you change this,
+%% the next LaTeX run may show spurious errors.  Simply run it again.
+%% If they persist, remove the .aux file and try again.
+\usepackage[english]{babel}
+
+%% For underlined wrapped text.
+\usepackage{soul}
+
+%% This changes default fonts for both text and math mode to use Herman Zapfs
+%% excellent Palatino font.  Do not change this.
+\usepackage[sc]{mathpazo} % Not needed with xelatex
+
+%% The AMS-LaTeX extensions for mathematical typesetting.  Do not
+%% remove.
+\usepackage{amsmath,amssymb,amsfonts,mathrsfs}
+
+%% Gantt Charts in LaTeX
+\usepackage{pgfgantt}
+
+%% LaTeX' own graphics handling
+\usepackage{graphicx}
+
+%% Fancy character protrusion.  Must be loaded after all fonts.
+\usepackage[activate]{pdfcprot}
+
+%% Nicer tables.  Read the excellent documentation.
+\usepackage{booktabs}
+
+% Compressed itemized lists (with a * at the end)
+\usepackage{mdwlist}
+
+%% Nicer URLs.  
+\usepackage{url}
+
+%% Configure citation styles
+\usepackage[numbers,sort&compress,square]{natbib}
+\def\bibfont{\footnotesize}     %for smaller fonts in the biblio section
+
+%% Hyper Ref package. In order to operate correctly, it must be the last package declared
+\usepackage[colorlinks,pagebackref,breaklinks]{hyperref} 
+
+%% Extra package options
+\hypersetup{
+  hypertexnames=true, linkcolor=blue, anchorcolor=black,
+  citecolor=blue, urlcolor=blue  
+}
+
+\urlstyle{rm} %so it doesn't use a typewriter font for urls.
+\DeclareGraphicsExtensions{.jpg,.pdf,.mps,.png} % for pdflatex
+\graphicspath{{img/} {./}} %put all figures in these dirs
+
+\newcommand{\alert}[1]{{\color{red}\textbf{#1}}}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% ========================================================
+%% IMPORTANT store proposal information in global variables
+%% ========================================================
+\title{Full Title of the Proposal ($<$200 chars)}
+\shortname{ACRONYM} 
+\titlelogo{}{0.25} % file name and scale
+\fundingscheme{Research and Innovation Action}
+\topic{Work Programme topic addressed}
+\coordinator{Name of coordinator}{email}{fax}
+\participant{University of Coordinator}{UoC}{Country1} % First participant is the coordinator
+\participant{University of partner 2}{UoP2}{Country2} % as example...
+\participant{University of partner 3}{UoP3}{Country3} % as example...
+% etc.
+
+% Page Headers
+%\makeoddhead{proposal}{\disptoken{@acronym}}{}{\rightmark}
+%\makeevenhead{proposal}{\leftmark}{}{\disptoken{@acronym}}
+
+%Page Footers
+%\makeevenfoot{proposal}{ \thepage }{ \date{\today} }{ \disptoken{@acronym} }
+%\makeoddfoot{proposal}{  }{ \date{\today} }{ \thepage }
+
+%Page Style
+\pagestyle{proposal} %use \pagestyle{showlocs} for debugging
+
+%Heading style 
+\makeheadstyles{default}{%
+\renewcommand*{\chapnamefont}{\normalfont\bfseries}
+\renewcommand*{\chapnumfont}{\normalfont\bfseries}
+\renewcommand*{\chaptitlefont}{\normalfont\bfseries}
+\renewcommand*{\secheadstyle}{\normalfont\bfseries}
+}%
+\headstyles{default}
+
+%Chapter Style
+\chapterstyle{section} %Avoid writing the word "Chapter" at the beginning of each proposal section
+% other possible valid styles:
+% article, bringhurst, crosshead, culver, dash, demo2, ell, southall, tandh, verville, wilsondob
+\renewcommand*{\chaptitlefont}{\normalfont\Large\bfseries}
+\renewcommand*{\chapnumfont}{\normalfont\Large\bfseries}
+
+
+
+\begin{document}
+
+\instructions{\centerline{\textbf{Proposal template}}}
+\instructions{\centerline{\textbf{(Technical annex)}}}
+\vskip0.5cm
+\instructions{\centerline{\textit{\textbf{Research and Innovation actions}}}}
+\vskip0.5cm
+\instructions{Please follow the structure of this template when preparing your proposal. It has been designed to ensure that the important aspects of your planned work are presented in a way that will enable the experts to make an effective assessment against the evaluation criteria. Sections 1, 2 and 3 each correspond to an evaluation criterion for a full proposal.}
+\vskip0.5cm
+\instructions{Please be aware that proposals will be evaluated as they were submitted, rather than on their potential if certain changes were to be made. This means that only proposals that successfully address all the required aspects will have a chance of being funded. There will be no possibility for significant changes to content, budget and consortium composition during grant preparation.}
+vskip0.5cm
+\instructions{\textbf{First stage proposals:} In two-stage submission schemes, at the first stage you only need to complete the parts indicated by a bracket (i.e. \} ) . These are in the cover page, and sections 1 and 2.}
+\vskip0.5cm
+\instructions{\textbf{Page limit:} For full proposals, the cover page, and sections 1, 2 and 3, together should not be longer than 70 pages. All tables in these sections must be included within this limit. The minimum font size allowed is 11 points. The page size is A4, and all margins (top, bottom, left, right) should be at least 15 mm (not including any footers or headers).}
+\vskip0.5cm
+\instructions{The page limit for a first stage proposal is 15 pages.}
+\vskip0.5cm
+\instructions{If you attempt to upload a proposal longer than the specified limit, before the deadline you will receive an automatic warning, and will be advised to shorten and re-upload the proposal. After the deadline, any excess pages will be overprinted with a ‘watermark’, indicating to evaluators that these pages must be disregarded.}
+\vskip0.5cm
+\instructions{Please do not consider the page limit as a target! It is in your interest to keep your text as concise as possible, since experts rarely view unnecessarily long proposals in a positive light.}
+
+
+
+
+
+
+
+
+
+
+
+
+
+%% TITLE
+\maketitle
+\instructions{
+Maximum length for Sections 1,2,3: 70 pages including all tables.\\ 
+
+Please use the same participant numbering as that used in the administrative proposal forms. (Not applicable in the case of stage-1 proposals in two stage schemes.)\\
+For first stage proposals, please note that this table will be used to check whether or not you comply with any minimum requirements linked to participation as set out in the eligibility criteria of the relevant work programme.
+}
+
+\vspace{-1em}
+\renewcommand\contentsname{Table of Contents}
+\setlength{\cftbeforechapterskip}{1.0em plus 0.3em minus 0.1em}
+\renewcommand{\cftchapterbreak}{\addpenalty{-4000}}
+\makeparticipantstable
+\tableofcontents*              
+%\input{abstract}              
+\pagebreak
+
+
+
+%% Main proposal
+
+%% Fixed proposal structure - Do not change
+\input{excellence} % Section I
+\input{impact} % Section II
+\input{implementation} % Section III
+
+
+\clearpage
+
+\input{members} % Section IV
+\input{ethics} % Section V
+
+\appendix
+
+\input{appendix} % Appendix
+
+\backmatter
+
+\bibliographystyle{plain}
+\bibliography{refs}
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/h2020proposal/template-ict/wp-develop.tex b/Master/texmf-dist/doc/latex/h2020proposal/template-ict/wp-develop.tex
new file mode 100644
index 00000000000..d55d8e08257
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/h2020proposal/template-ict/wp-develop.tex
@@ -0,0 +1,96 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%  Work Package Description  %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\begin{workpackage}{DEVELOPMENT WORK PACKAGE}
+  \label{wp:develop} %change and use appropriate description
+
+  %%%%%%%%%%%%%%%%%% TOP TABLE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+  % Data for the top table
+  \wpstart{1} %Starting Month
+  \wpend{36} %End Month
+  \wptype{Activity type} %RTD, DEM, MGT, or OTHER
+
+  % Person Months per participant (required, max 7, * for leader)  
+  % syntax: \personmonths{Participant number}{value}    (not wp leader)
+  %     or  \personmonths{Participant short name}{value} (not wp leader)
+  %         \personmonths*{Participant number}{value}    (wp leader)
+  % for example:
+  \personmonths*{UoP2}{12}
+  \personmonths{UoP3}{6}
+  \personmonths{UoC}{3}
+  % etc.
+
+  \makewptable % Work package summary table
+    
+  % Work Package Objectives
+  \begin{wpobjectives}
+    This work package has the following objectives:
+    \begin{enumerate}
+    \item To develop ....
+    \item To apply this ....
+    \item etc.
+    \end{enumerate}
+  \end{wpobjectives}
+  
+  % Work Package Description
+  \begin{wpdescription}
+    % Divide work package into multiple tasks.
+    % Use \wptask command
+    % syntax: \wptask{leader}{contributors}{start-m}{end-m}{title}{description}   
+ 
+    Description of work carried out in WP, broken down into tasks, and
+    with role of partners list. Use the \texttt{\textbackslash wptask} command.
+
+    \wptask{UoC}{UoC}{1}{12}{Test}{
+      \label{task:wp2test}
+      Here we will test the WP Task code. 
+    }
+    \wptask{UoC}{UoC}{6}{9}{Integrate}{
+      \label{task:wp2integrate}
+      In this task UZH will integrate the work done in ~\ref{task:wp2test}.
+    }    
+    \wptask{UoP2}{All other}{9}{12}{Apply}{
+      Here all the WP participants will apply the results to...
+    }
+    
+    \paragraph{Role of partners}
+    \begin{description}
+    \item[Participant short name] will lead Task~\ref{task:wp2integrate}.
+    \item[UoC] will..
+    \end{description}
+  \end{wpdescription}
+  
+  % Work Package Deliverable
+  \begin{wpdeliverables}
+    % Data for the deliverables and milestones  tables
+    % syntax: \deliverable[delivery date]{nature}{dissemination
+    % level}{description} 
+    %
+    % nature: R = Report, P = Prototype, D = Demonstrator, O = Other
+    % dissemination level: PU = Public, PP = Restricted to other
+    % programme participants (including the Commission Services), RE =
+    % Restricted to a group specified by the consortium (including the
+    % Commission Services), CO = Confidential, only for members of the
+    % consortium (including the Commission Services).
+    % 
+    % \wpdeliverable[date]{R}{PU}{A report on \ldots}
+
+    \wpdeliverable[36]{UoC}{R}{PU}{Report on the definition of the model
+      specifications.}\label{dev:wp2specs}
+    
+    \wpdeliverable[12]{UoP3}{R}{PU}{Report on Feasibility study for the model
+      implementation.}\label{dev:wp2implementation}
+
+    \wpdeliverable[24]{UoP2}{R}{PU}{Prototype of model
+      implementation.}\label{dev:wp2prototype}
+
+  \end{wpdeliverables}
+
+\end{workpackage}
+
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: "proposal-main"
+%%% End:
diff --git a/Master/texmf-dist/doc/latex/h2020proposal/template-ict/wp-management.tex b/Master/texmf-dist/doc/latex/h2020proposal/template-ict/wp-management.tex
new file mode 100644
index 00000000000..48aaf7f10aa
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/h2020proposal/template-ict/wp-management.tex
@@ -0,0 +1,96 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%  Work Package Description  %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\begin{workpackage}{MANAGEMENT  WORK PACKAGE}
+  \label{wp:management} %change and use appropriate description
+
+  %%%%%%%%%%%%%%%%%% TOP TABLE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+  % Data for the top table
+  \wpstart{1} %Starting Month
+  \wpend{36} %End Month
+  \wptype{Activity type} %RTD, DEM, MGT, or OTHER
+
+  % Person Months per participant (required, max 7, * for leader)  
+  % syntax: \personmonths{Participant number}{value}    (not wp leader)
+  %     or  \personmonths{Participant short name}{value} (not wp leader)
+  %         \personmonths*{Participant number}{value}    (wp leader)
+  % for example:
+  \personmonths*{UoC}{12}
+  \personmonths{UoP2}{3}
+  \personmonths{UoP3}{2}
+  % etc.
+
+  \makewptable % Work package summary table
+    
+  % Work Package Objectives
+  \begin{wpobjectives}
+    This work package has the following objectives:
+    \begin{enumerate}
+    \item To develop ....
+    \item To apply this ....
+    \item etc.
+    \end{enumerate}
+  \end{wpobjectives}
+  
+  % Work Package Description
+  \begin{wpdescription}
+    % Divide work package into multiple tasks.
+    % Use \wptask command
+    % syntax: \wptask{leader}{contributors}{start-m}{end-m}{title}{description}   
+ 
+    Description of work carried out in WP, broken down into tasks, and
+    with role of partners list. Use the \texttt{\textbackslash wptask} command.
+
+    \wptask{UoC}{UoC}{1}{12}{Test}{
+      \label{task:wp1test}
+      Here we will test the WP Task code. 
+    }
+    \wptask{UoC}{UoC}{6}{9}{Integrate}{
+      \label{task:wp1integrate}
+      In this task UZH will integrate the work done in ~\ref{task:wp1test}.
+    }    
+    \wptask{UoP3}{All other}{9}{12}{Apply}{
+      Here all the WP participants will apply the results to...
+    }
+    
+    \paragraph{Role of partners}
+    \begin{description}
+    \item[Participant short name] will lead Task~\ref{task:wp1integrate}.
+    \item[UoC] will..
+    \end{description}
+  \end{wpdescription}
+  
+  % Work Package Deliverable
+  \begin{wpdeliverables}
+    % Data for the deliverables and milestones  tables
+    % syntax: \deliverable[delivery date]{nature}{dissemination
+    % level}{description} 
+    %
+    % nature: R = Report, P = Prototype, D = Demonstrator, O = Other
+    % dissemination level: PU = Public, PP = Restricted to other
+    % programme participants (including the Commission Services), RE =
+    % Restricted to a group specified by the consortium (including the
+    % Commission Services), CO = Confidential, only for members of the
+    % consortium (including the Commission Services).
+    % 
+    % \wpdeliverable[date]{R}{PU}{A report on \ldots}
+
+    \wpdeliverable[36]{UoC}{R}{PU}{Report on the definition of the model
+      specifications.}\label{dev:wp1specs}
+    
+    \wpdeliverable[12]{UoP3}{R}{PU}{Report on Feasibility study for the model
+      implementation.}\label{dev:wp1implementation}
+
+    \wpdeliverable[24]{UoP2}{R}{PU}{Prototype of model
+      implementation.}\label{dev:wp1prototype}
+
+  \end{wpdeliverables}
+
+\end{workpackage}
+
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: "proposal-main"
+%%% End:
diff --git a/Master/texmf-dist/doc/latex/h2020proposal/template-ict/wp-test.tex b/Master/texmf-dist/doc/latex/h2020proposal/template-ict/wp-test.tex
new file mode 100644
index 00000000000..693683c1cd6
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/h2020proposal/template-ict/wp-test.tex
@@ -0,0 +1,96 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%  Work Package Description  %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\begin{workpackage}{TEST WORK PACKAGE}
+  \label{wp:test} %change and use appropriate description
+
+  %%%%%%%%%%%%%%%%%% TOP TABLE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+  % Data for the top table
+  \wpstart{1} %Starting Month
+  \wpend{36} %End Month
+  \wptype{Activity type} %RTD, DEM, MGT, or OTHER
+
+  % Person Months per participant (required, max 7, * for leader)  
+  % syntax: \personmonths{Participant number}{value}    (not wp leader)
+  %     or  \personmonths{Participant short name}{value} (not wp leader)
+  %         \personmonths*{Participant number}{value}    (wp leader)
+  % for example:
+  \personmonths{UoP2}{8}
+  \personmonths*{UoP3}{12}
+  \personmonths{UoC}{3}
+  % etc.
+
+  \makewptable % Work package summary table
+    
+  % Work Package Objectives
+  \begin{wpobjectives}
+    This work package has the following objectives:
+    \begin{enumerate*}
+    \item To develop ....
+    \item To apply this ....
+    \item etc.
+    \end{enumerate*}
+  \end{wpobjectives}
+  
+  % Work Package Description
+  \begin{wpdescription}
+    % Divide work package into multiple tasks.
+    % Use \wptask command
+    % syntax: \wptask{leader}{contributors}{start-m}{end-m}{title}{description}   
+ 
+    Description of work carried out in WP, broken down into tasks, and
+    with role of partners list. Use the \texttt{\textbackslash wptask} command.
+
+    \wptask{UoC}{UoC}{1}{12}{Test}{
+      \label{task:wp3test}
+      Here we will test the WP Task code. 
+    }
+    \wptask{UoC}{UoC}{6}{9}{Integrate}{
+      \label{task:wp3integrate}
+      In this task UZH will integrate the work done in ~\ref{task:wp3test}.
+    }    
+    \wptask{UoP3}{All other}{9}{12}{Apply}{
+      Here all the WP participants will apply the results to...
+    }
+    
+    \paragraph{Role of partners}
+    \begin{description*}
+    \item[Participant short name] will lead Task~\ref{task:wp3integrate}.
+    \item[UoC] will..
+    \end{description*}
+  \end{wpdescription}
+  
+  % Work Package Deliverable
+  \begin{wpdeliverables}
+    % Data for the deliverables and milestones  tables
+    % syntax: \deliverable[delivery date]{nature}{dissemination
+    % level}{description} 
+    %
+    % nature: R = Report, P = Prototype, D = Demonstrator, O = Other
+    % dissemination level: PU = Public, PP = Restricted to other
+    % programme participants (including the Commission Services), RE =
+    % Restricted to a group specified by the consortium (including the
+    % Commission Services), CO = Confidential, only for members of the
+    % consortium (including the Commission Services).
+    % 
+    % \wpdeliverable[date]{R}{PU}{A report on \ldots}
+
+    \wpdeliverable[36]{UoC}{R}{PU}{Report on the definition of the model
+      specifications.}\label{dev:wp3specs}
+    
+    \wpdeliverable[12]{UoP3}{R}{PU}{Report on Feasibility study for the model
+      implementation.}\label{dev:wp3implementation}
+
+    \wpdeliverable[24]{UoP2}{R}{PU}{Prototype of model
+      implementation.}\label{dev:wp3prototype}
+
+  \end{wpdeliverables}
+
+\end{workpackage}
+
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: "proposal-main"
+%%% End: