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 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
Merge branch 'master' into 6.0
Bump the minimum gear ilvl to 500
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
Use the proper form_for fix. Doh.
Merge branch '6.0' of github.com:cheald/shadowcraft-ui into 6.0
reintrodice agi_bonus
add all chance bonuses to items on import, do not import old trinkets with wod mechanic, fix optimize enchants if an item slot was empty