Team work commit -  Bugfix resourse message; use properties insetad of fields; invalid command exception handling;