naming
for pulling
Merge branch 'master' of https://github.com/cellax/cellax-server
- Simplify model (Delete Soil, make Grape and Area point to Wikipedia for now)
- add a test adding some Grapes to the data base
- change the template so that it allows for addong grapes (and no soil, since it is not a model anylonger)