cc
Merge branch 'master' of ssh://git@github.com/Dinidu/Spectrorama.git

Conflicts:
	Spectrorama/src/spec/mail/scheduler/JobMailTrigger.java