Merge sdirimarwen/master

Conflicts:
	tunisianwatchme/src/com/tunisianwatchme/Gui/Midlet.java
Merge sdirimarwen/master
Merge sdirimarwen/master

Conflicts:
	tunisianwatchme/src/com/tunisianwatchme/Gui/Midlet.java