merge conflicts base and home
Merge branch 'master' of /home/uncviscom/webapps/galapagos_dev_repo/repos/livinggalapagos