funcional
oo
hh
Merge branch 'development' into funcional1

Conflicts:
	src/main/java/com/github/maven/example/Widget.java
Merge branch 'funcional1'