modified:   app/assets/javascripts/controllers/recipients/import.js.coffee
	modified:   app/views/sessions/new.html.erb
	modified:   public/templates/recipients/import.html
Merge branch 'master' of https://github.com/riseplus/sms

Conflicts:
	public/templates/recipients/import.html
	modified:   public/templates/recipients/import.html