added
update greet user
updated greet state
Merge branch 'master' of https://github.com/ukcvo/DialogModeling

Conflicts:
	DialogModeling/src/edu/kit/anthropomatik/isl/DialogModeling/State/Main.java
	DialogModeling/testfile1.flac