Changes to reflect new path to search for translations. Added msgmerge.sh to merge new translations with old ones
Merge branch 'master' of https://github.com/divby00/solstice