Merge origin/master

Conflicts:
	src/com/tunisianwatch/Gui/ProfilPanel.form
	src/com/tunisianwatch/Gui/ProfilPanel.java