Merge marwensdiri/master

Conflicts:
	src/com/tunisianwatch/Gui/MainFrame.form
	src/com/tunisianwatch/Gui/MainFrame.java
	src/com/tunisianwatch/Main/Main.java