Arlei Commit

Modified Messages.java to support HashMap values
Modified Database.java