javafx
Merge origin/master
maps
Merge origin/master

Conflicts:
	src/main/java/br/com/wservice/GeraAmostra.java
<property name="hibernate.transaction.auto_close_session">true</property>
    <property name="hibernate.connection.release_mode">after_statement</property>