login
wevb
Merge origin/master

Conflicts:
	src/java/pt/uc/dei/aor/grupod/proj5/controllers/EditionController.java