Merge branch 'master' into josh_features

Conflicts:
	db/schema.rb
Merge branch 'master' into josh_features
Merge branch 'master' into josh_features
reduced emailid length in sms template to 30 characters
Merge branch 'master' of https://github.com/StrataLabs/service_desk
fixng spec for emailid length change
Merge pull request #4 from StrataLabs/josh_features

Closure notes display when re-open
Merge branch 'master' into links

Conflicts:
	db/schema.rb