working on ajax validation, fixes for toolkit
Merge remote-tracking branch 'upstream/master'
phil messed up the styles again