Merge branch 'master' of https://github.com/isel-leic-mpd/mpd-2013-i41d
misc
Merge branch 'master' of https://github.com/brunoss/mpd-2013-i41d

Conflicts:
	aula06/src/main/java/setters/ISetter.java
	aula06/src/main/java/setters/MultipleSetter.java
	aula06/src/main/java/setters/Setters.java