Merge from repository
Image Issues
Merged
Merged
Merge branch 'master' of https://github.com/Ideyatech/opentides3

Conflicts:
	opentides3-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/template/template-crud-page.jsp
	opentides3-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/template/template-page.jsp
	opentides3-core/src/main/java/org/opentides/dao/impl/SequenceDaoJpaImpl.java
	opentides3-core/src/main/resources/localhost.properties