Integrerade in current_user i appen
Integrerade in current_user i appen

Conflicts:
	app/assets/javascripts/controllers/CommentController.js
	app/assets/javascripts/controllers/FavoritController.js
	app/assets/javascripts/controllers/FavoritListController.js
	app/assets/javascripts/controllers/RatingController.js
	app/controllers/comments_controller.rb
	db/development.sqlite3
	db/seeds.rb
	tmp/cache/assets/development/sprockets/0335d87ebd93523744c2fec4426f4432
	tmp/cache/assets/development/sprockets/0618534d3242f3dcb1f4787fc334c441
	tmp/cache/assets/development/sprockets/0835123035b104dbf80a4ad77f39c9bb
	tmp/cache/assets/development/sprockets/0b2c068d6a7394dc0f7b5dd17adba180
	tmp/cache/assets/development/sprockets/0c9f5a68e10c76b2d39acc37bb242e22
	tmp/cache/assets/development/sprockets/0dcccf3cf5085ef5fb5e5a857889dad0
	tmp/cache/assets/development/sprockets/0f8aa08bcb16235a9f63bb55b7cdaad8
	tmp/cache/assets/development/sprockets/13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/development/sprockets/1638f87db345b13872695759502b54fe
	tmp/cache/assets/development/sprockets/194391614c6fdaf9f4350b1992a9c269
	tmp/cache/assets/development/sprockets/1aa9db00a035fb8d3f4ff6b869cf77ed
	tmp/cache/assets/development/sprockets/208b276c3d886a29524f83f3a9692c72
	tmp/cache/assets/development/sprockets/2509c34513ea6ddb2c9817a95ecad8b7
	tmp/cache/assets/development/sprockets/262d931d659ef5f2d514a52f819e2707
	tmp/cache/assets/development/sprockets/28467b2364a11be644131b54c4fb9740
	tmp/cache/assets/development/sprockets/2a96b80b463336c30d8d9bab378ea92b
	tmp/cache/assets/development/sprockets/2e76cb2929313d277f648e8c369936ab
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/334b9bca4ba485df9f52fc47939b9581
	tmp/cache/assets/development/sprockets/338abd3be593ddd2e0e73c1a1b81b907
	tmp/cache/assets/development/sprockets/357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/development/sprockets/3597de41f64a8e7ba83d94f918413d49
	tmp/cache/assets/development/sprockets/3665aa30fefe8e40fe1f86cc5f90de35
	tmp/cache/assets/development/sprockets/3f85788911a359bc3309e6776974b939
	tmp/cache/assets/development/sprockets/402b8e821398e441d1a76d374955b081
	tmp/cache/assets/development/sprockets/4648dcd61eb72e3b08e73c6ac9c57460
	tmp/cache/assets/development/sprockets/46ef378397125ec6711c3a9782ba5ca2
	tmp/cache/assets/development/sprockets/4b13b4b5bfd3e97b0b3113903152cc18
	tmp/cache/assets/development/sprockets/4e479e13599dea37f037bb8ad06ec970
	tmp/cache/assets/development/sprockets/501ccda87fc685d3ca6967a0bb3d4656
	tmp/cache/assets/development/sprockets/60e2f40b1cd63a1d921cddb21eb6484a
	tmp/cache/assets/development/sprockets/635f7c85b0dad94162bebcd0878e5fb9
	tmp/cache/assets/development/sprockets/63a7b6ed7e7d7e9a1cc82aa11c9e3137
	tmp/cache/assets/development/sprockets/63da6618d941b54ffc3ddaeff9d30a9d
	tmp/cache/assets/development/sprockets/67eb859757910e1082d8534cbce75a2a
	tmp/cache/assets/development/sprockets/6efa6f743d00a7fdebc1da532b3020af
	tmp/cache/assets/development/sprockets/73cf352579b646a784a2780873ee5ea8
	tmp/cache/assets/development/sprockets/73d5b3d4a4584cbe9dfa3937b134c007
	tmp/cache/assets/development/sprockets/78de8f7c2145ef07f9d4d203cff0e477
	tmp/cache/assets/development/sprockets/874ecb35052ac92d5bf8c190cb21b942
	tmp/cache/assets/development/sprockets/8788dc81d3946c766c660557bf913b8b
	tmp/cache/assets/development/sprockets/87a586e93161a0750403745325cb0a9f
	tmp/cache/assets/development/sprockets/8a0e7cc1ca5e1af0b1a30ac42ea00e1a
	tmp/cache/assets/development/sprockets/8f7cc04b13b8ed201baa70e0c25823fa
	tmp/cache/assets/development/sprockets/92e01fa8606045d48e266713af6da68e
	tmp/cache/assets/development/sprockets/92e28021c7f370f65a20f9537fb2609f
	tmp/cache/assets/development/sprockets/92ee1fcb1e21b2555c6673499c6a4cb3
	tmp/cache/assets/development/sprockets/9527c988c4349b6a68e2b2440f395368
	tmp/cache/assets/development/sprockets/96f3564b5037e92457ebbcc8b03c2a03
	tmp/cache/assets/development/sprockets/9dac3be5f40038af88b9af3905d1c047
	tmp/cache/assets/development/sprockets/9dd326909c9f00b05e6e8f034acf82a6
	tmp/cache/assets/development/sprockets/9e34e3791f68cfb1e4cea58df97dad6d
	tmp/cache/assets/development/sprockets/a07e579d4f5d6234a699611aa67e8bdc
	tmp/cache/assets/development/sprockets/a2e70d52d1fb5c8085c82d00c6dd5dfb
	tmp/cache/assets/development/sprockets/a6df892712abef3e9017887e1debfc99
	tmp/cache/assets/development/sprockets/b785d6f8af75894eef2e079925e7d8d0
	tmp/cache/assets/development/sprockets/b7da10477b43132836583f6e7c060753
	tmp/cache/assets/development/sprockets/b9791e56dd9e7817fce8392e7be4d695
	tmp/cache/assets/development/sprockets/c22d546bc36d7fe984936c233a4b95f0
	tmp/cache/assets/development/sprockets/cb86e05933b15aa784a52f07b0d216f6
	tmp/cache/assets/development/sprockets/ceab5370ca147e6a09b7895a495b1a64
	tmp/cache/assets/development/sprockets/cffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/development/sprockets/d57e1cb2731fcf337b042b1c3fc6e518
	tmp/cache/assets/development/sprockets/d5b85445c655f360b8f42a17a1e16444
	tmp/cache/assets/development/sprockets/d771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/development/sprockets/ec6075edf259bf0c31c4966f206162b7
	tmp/cache/assets/development/sprockets/ee35cf33f13e333fc999886d2553d15e
	tmp/cache/assets/development/sprockets/f0b20b33da2e8a97c06e6da78084940f
	tmp/cache/assets/development/sprockets/f1663d34d4b6003379113df98f1433a5
	tmp/cache/assets/development/sprockets/f3692850d5ec2541844fb9acdb44b594
	tmp/cache/assets/development/sprockets/f7b485634f688adbac1c5ae458de1384
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/development/sprockets/f82d2ca0df1799830b1f44b8453f2f6b
	tmp/cache/assets/development/sprockets/fad1bcfdcaeec8216d892f48ad19f152
	tmp/cache/assets/development/sprockets/fc1a45d0e8c487093ccf503c385e7389
	tmp/pids/server.pid