Warlords of Draenor RC1
Merge branch '6.0' of https://github.com/cheald/shadowcraft-ui into 6.0

Conflicts:
	app/controllers/items_controller.rb
	app/models/character.rb
	backend/app/server.py