Test two way push
Two way push commit
Merge branch 'Notificare' into NewInfraBranch

Conflicts:
	dialoghandler/src/main/java/com/almende/dialog/adapter/NotificareServlet.java
	dialoghandler/src/main/java/com/almende/dialog/adapter/tools/Notificare.java
	dialoghandler/src/main/webapp/WEB-INF/web.xml
Merge branch 'NewInfraBranch' of https://github.com/almende/dialog into NewInfraBranch