Merge origin/master

Conflicts:
	src/main/java/br/com/utils/tipstricks/RegexUtils.java
Merge origin/master