some changes.
Merge branch 'dissimination' of github.com:mamoit/semaphore-tos into dissimination

Conflicts:
	semaphore/SemaphoreC.nc