NEW: made attachment to database persistence
Merge branch 'development' of github.com:engagepoint/labs-test-message-server into development