Updated

Change-Id: I6c53f5a7a9cdcdaf8f201a12d5564aba2d430881
test

Change-Id: Id37f63172784f58bdd38cbd52b112ce222a5982b
test

Change-Id: I5c0db757d208e644e5970765958dec5d137fa5c4
Merge branch 'alexandria' of ssh://gerrit.gromacs.org:29418/gromacs into alexandria
Made force field generation work and basic gentop functionality is
now also working.

Change-Id: Ia9ae22fa1b33e72978fc046a427f718ae98d8453