rbenv compat
Rails 3.2.18 update
Remove client side validations gem
jQuery 1.10.0 update
Colorbox 1.5.9 update
Devise 3.2.4 update
ActiveAdmin 0.6.3 update
Admin UI update
Database default socket
Global changes
ArmyList PDF
Add quantity to army_list_units_magic_items
Merge branch 'master' of github.com:kevynlebouille/Whbab

Conflicts:
	Gemfile.lock