nova versão netmanager
Merge branch 'master' of https://github.com/viniciusinnovatium/netmanager

Conflicts:
	src/main/java/com/disclinc/netmanager/servlet/NetmanagerRequestHandler.java
	src/main/java/com/disclinc/netmanager/servlet/NetmanagerServlet.java