Merge pull request #7 from zucchi/mergefixes

Pull request to fix merge inconsistencies
added copy of build.properties to setup.sh