Ronny save
Merge branch 'master' of https://github.com/Drmsoul/Smiles4me

Conflicts:
	Gemfile.lock
	app/views/users/show.html.erb
	log/development.log
	tmp/cache/assets/C26/690/sprockets%2F93708cb34051f3000884905e8669d74a
	tmp/cache/assets/C5D/DD0/sprockets%2F8737d87a7252f6a8752b04710d6168e5
	tmp/cache/assets/C80/840/sprockets%2F562c2d168da585f80579347d10790a0a
	tmp/cache/assets/C91/A20/sprockets%2F53640067d96589fbc39f702a6e19b645
	tmp/cache/assets/C99/4D0/sprockets%2F5e30a6b911437f1428dc32c3ae182123
	tmp/cache/assets/C9F/560/sprockets%2F8e5a9738e9bc15478e026d98335454f9
	tmp/cache/assets/CC0/710/sprockets%2F19ce6c425d4c775f7489a1794744f1a1
	tmp/cache/assets/CD5/2C0/sprockets%2F166c056119ebdfb8b7104c97b424b423
	tmp/cache/assets/CD7/6F0/sprockets%2Fbd3936370d0f952ada5774e2230046ed
	tmp/cache/assets/CD9/590/sprockets%2Fd9b553d21a9209af6093c2c196037be3
	tmp/cache/assets/CE5/E90/sprockets%2F40acaf6e554534644439afc38f622d77
	tmp/cache/assets/CF2/010/sprockets%2F7be9086c960bb4384c9d23a52e489f29
	tmp/cache/assets/CFD/840/sprockets%2Fcc1654a919f2050c27d6271241bebd5a
	tmp/cache/assets/D03/670/sprockets%2F6c0f2a2c7346b84a92e2cb81473e251b
	tmp/cache/assets/D03/BD0/sprockets%2Fcc96d4f5f41bc2990cc2b1a151027852
	tmp/cache/assets/D0A/480/sprockets%2Fe6ac0456092c5382d2c646eace496b13
	tmp/cache/assets/D17/270/sprockets%2F2757fae967a52701ef3724ae5a76c4a8
	tmp/cache/assets/D17/2B0/sprockets%2F0c6c563476f3c0a819d0d8ffd1684c29
	tmp/cache/assets/D1D/ED0/sprockets%2F9fab2d5493beec802960059a5f9e1478
	tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/D3A/A90/sprockets%2F3ecc85aff4d4243e2e5603ab35e63608
	tmp/cache/assets/D41/3A0/sprockets%2F14b8bbfdd15b59549741e900b7dd66a4
	tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/D56/930/sprockets%2Fb150860fa4b8c9d01f5a19c2a3aa5c32
	tmp/cache/assets/D5A/EA0/sprockets%2Fd771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/D5E/170/sprockets%2F2f2229c70dcf195564d4d0fd6a12ac1a
	tmp/cache/assets/D5E/4D0/sprockets%2Faa61726715c46ea17a59c216bcadaa29
	tmp/cache/assets/D62/0C0/sprockets%2F34fc254ac019d112e93be13fa7f9d0e3
	tmp/cache/assets/D71/870/sprockets%2F719acae445926185ae4da14febf41e58
	tmp/cache/assets/D74/E30/sprockets%2F491cdd0ce60f3df20b29cd098f8d4773
	tmp/cache/assets/D79/9D0/sprockets%2F6ea17d7230964f04e6dd9cc9a724bf7d
	tmp/cache/assets/D93/C50/sprockets%2Feb955148dff1a927d71ba221df32d1ac
	tmp/cache/assets/D95/BC0/sprockets%2F4ea33e825e6e38bd22dccab488a0255b
	tmp/cache/assets/DA4/460/sprockets%2F977ead1d20bc9f7e1c191bd4348f9e3a
	tmp/cache/assets/DA5/5E0/sprockets%2F27b7b7bd9f7c1826bb8152aeffe82a35
	tmp/cache/assets/DA5/FB0/sprockets%2Ff644fd75cbead0e58c847aa16546e2a8
	tmp/cache/assets/DAB/BC0/sprockets%2F05307666b626ddfa9efc97cd72e36bbf
	tmp/cache/assets/DAE/A20/sprockets%2F936bbcbcfc6db6954962948dc153fe1e
	tmp/cache/assets/DF3/490/sprockets%2F4ccb36353ccad2c1dca92f21cf93c84f
	tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/E0A/CA0/sprockets%2F7fe72ac1c0db1a7e8e7f59cf25e8a39e
	tmp/cache/assets/E19/2A0/sprockets%2F10fcfbe6ebae11a40c8eac41939a1b9a
	tmp/cache/assets/E41/470/sprockets%2F9b6bca5ee9c8a1c295e8ed28ffc4ec29
	tmp/cache/assets/E5F/E20/sprockets%2F86f909bf5baee50515afadaa3ce2df8f