add first implementation for bonuses
add first implementation for bonuses
Merge branch '6.0' of https://github.com/cheald/shadowcraft-ui into 6.0

Conflicts:
	backend/app/server.py
Add lock all/unlock all buttons
add first implementation for bonuses
Merge branch '6.0' of https://github.com/cheald/shadowcraft-ui into 6.0
update item_data and add item bonus data
Bump the required character level to 100
Merge branch 'master' into 6.0
Bump the minimum gear ilvl to 500
Merge pull request #39 from timwoj/master

Force the character page to reload when refreshing from armory
Merge pull request #38 from timwoj/lockall

Add lock all/unlock all buttons
Merge branch 'master' into 6.0
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
Fix character path in form
Merge branch '6.0' of github.com:cheald/shadowcraft-ui into 6.0
add sea to regions
Fix character path generation
Merge branch '6.0' of https://github.com/cheald/shadowcraft-ui into 6.0