Merge origin/master

Conflicts:
	src/com/tunisianwatch/Main/Main.java
Merge origin/master