xaxa
Merge branch 'master' of https://github.com/Maczaj/LensDesigner

Conflicts:
	src/main/java/mma/pszt/LensDesigner.java