Fixed the server, simplified the webService, setted up the notificationType to 10101
Added the extra task
Pushed Adi & Vali's changes