begin validating params
implemented max length of 2 chars in text fields
Merge branch 'master' into development