Merge pull request #34 from thehyve/features/SESIDEV-75-variable-taxonomy-association

Added a feature to store an association between variable and taxonomy
Merge branch 'master' of https://github.com/thehyve/sesi_site
Merge branch 'master' of https://github.com/thehyve/sesi_site
Merge branch 'master' of https://github.com/thehyve/sesi_site
Merge branch 'master' of https://github.com/thehyve/sesi_site
Merge branch 'master' of https://github.com/thehyve/sesi_site
Merge branch 'master' of https://github.com/thehyve/sesi_site
Merge branch 'master' of https://github.com/thehyve/sesi_site
Merge branch 'master' of https://github.com/thehyve/sesi_site
Merge branch 'master' of https://github.com/thehyve/sesi_site
Merge branch 'master' of https://github.com/thehyve/sesi_site
Merge branch 'master' of https://github.com/thehyve/sesi_site
Merge branch 'master' of https://github.com/thehyve/sesi_site
Merge branch 'master' of https://github.com/thehyve/sesi_site
Merge branch 'master' of https://github.com/thehyve/sesi_site
Merge branch 'master' of https://github.com/thehyve/sesi_site
Merge branch 'master' of https://github.com/thehyve/sesi_site
Merge branch 'master' of https://github.com/thehyve/sesi_site
Merge branch 'master' of https://github.com/thehyve/sesi_site
Merge branch 'master' of https://github.com/thehyve/sesi_site