Merge branch 'master' of https://github.com/crystaldou/GraceTunes

Conflicts:
	Gemfile.lock
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/playlists_controller.rb
Merge branch 'master' of https://github.com/crystaldou/GraceTunes

Conflicts:
	Gemfile.lock
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/songs/view.html.haml
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/songs/view.html.haml
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/songs/view.html.haml
Merge remote-tracking branch 'origin/master'