z
Merge branch 'master' of https://github.com/mroland/VarjaoClipping.git

Conflicts:
	src/br/com/varjaoclipping/util/Main.java
	src/br/com/varjaoclipping/util/Utilitarios.java