Merge origin/master

Conflicts:
	src/com/tunisianwatch/Gui/ConsultationPanel.java
Merge origin/master