Added dlr-mask parameter
Added dlr-mask parameter
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/kannel_rails/config.rb
Added from parameter
Added from parameter
Added from parameter