workflow states and databasefix
Merge pull request #25 from slwaller/master

workflow states and databasefix
fixing merge