Added the mappings necessary for android to handle java.util.Date and java.sql.Timestamp via xmpp
Merge branch 'paddy_userfeedback' into Student_Trial