changed simple-push to String instead of Map
removed unused import
fix prepareMessage method to handle simplePush attribute
Prevent NPE when serverURL is null
Update Unit tests