Adjusted interfaces
Merge branch 'master' of https://github.com/icpcpp/edward

Conflicts:
	gui/moc_MainWindow.cpp