Merge origin/0.148 into 0.148

Conflicts:
	src/main/java/br/com/dasa/wservice/wscie/ApplicationConfig.java