error fix
Merge branch 'master' of github.com:hazelcastInternsSummer14/customSerialization