Some intermediate updates

Implementing Monte Carlo SWH functionality. Techplacement will not
currently work as coding is in progress.
Merge pull request #2 from christianurich/dance4water

change dialog show() to exec_()
Merge branch 'master' into dance4water