merge
Fix #314
Fix #227 Upnp players show current status at first level
Merge branch 'demo_decembre-2014' of https://github.com/appsgate2015/appsgate into test
Fixed #287
Fixed #355
Fixing regression
Address #351 MailService now trigger an event when a mail is sent by apam (server side: done, not yet in the client)
Fix #265 : l'arrêt d'un programme l'arrête vraiment
Fix pour les contrôles des device dans la vue des lieux de vie
Fix #351 Event with mailSent now integrated on client side
Allowing wildcards * for events, the wildcard can match any eventName or eventVlue
UPnP : add verification to UPnP event
Merge branch 'master' of https://github.com/appsgate2015/appsgate
UPnP : minor modification to clean-up templates
Merge branch 'master' of https://github.com/appsgate2015/appsgate into test
Merge branch 'demo_decembre-2014' of https://github.com/appsgate2015/appsgate into test