Merge pull request #79 from alemela/devel_20140505

Devel 20140505
setup.sh: add possibility to reinstall without rewrite existing data