Initial commit: add allocationMode user preference and form for choosing it
Merge branch 'develop' into sabe/attributes
Get attributes layout up-to-date with develop changes
Add debug button to hand out levels one at a time
Add attribute training to user model
Merge branch 'develop' into sabe/attributes
challenges: don't remove To-Dos that are part of a challenge when
clearing completed
challenges: but provide default notes
Fix AuthCtrl tests with proper asserts
Use $window on inventoryCtrl, so it can be mocked on tests
Added inventoryCtrl tests for hatching and selling
fix #2205 hide checklist button from challenges
Merge pull request #2253 from djuretic/inventory_tests

More InventoryCtrl tests
Tests for choosing a pet and buying an egg
Minor style changes to inventoryCtrlSpec.js
Test refactoring: user.user -> user
Merge remote-tracking branch 'origin/sabe/attributes' into develop

Conflicts:
	views/shared/footer.jade
Tests for filtersCtrl
fix gems styling
remove unnecessary text tags