Merge origin/master

Conflicts:
	tunisianwatchme/nbproject/project.properties
	tunisianwatchme/src/com/tunisianwatchme/Gui/Midlet.java
Merge origin/master

Conflicts:
	tunisianwatchme/nbproject/project.properties
	tunisianwatchme/src/com/tunisianwatchme/Gui/Midlet.java