Merge branch 'develop'
add link img
add img sms
add img sms
Merge branch 'develop' into add_img_sms

Conflicts:
	db/schema.rb
Merge branch 'add_img_sms' into develop