no max
Merge branch 'REFACTOR-BRANCH' of https://github.com/alexjck/ATI into REFACTOR-BRANCH

Conflicts:
	src/main/java/com/itba/edu/ar/backend/model/PreImage.java
	src/main/java/com/itba/edu/ar/frontend/ATIFrame.java