* Fixes for the security branch.
Merge branch 'IOSB-Develop' of github.com:OpenIotOrg/smart-cities into IOSB-Develop

Conflicts:
	GSNTcpListenWrapper/src/main/java/org/openiot/gsn/wrappers/tcplistener/BridgeLsmWebVS.java