pile o changes to make typeahead work.  needs some cleaning
please merge editable-entries plz

Conflicts:
	app/controllers/entries_controller.rb
changing icons around
Merge remote-tracking branch 'upstream/development' into super_merge_test

Conflicts:
	app/assets/javascripts/application.js
Merge pull request #52 from jbrewton/super_merge_test

Super merge test
make index page more readable
Merge branch 'development' into feature/readable-index
Merge pull request #53 from erumble/feature/readable-index

Feature/readable index
fix error when adding new cosplay to entry
nested attributes work, validations do not
person lookup on create
making the index page print lots of records to make printing "work"
adding print control assets
limiting what displays when printing on the index
update doesn't dup people
error handling for create and update entry
making data tables patrick sort friendly
crazy sort filters
validations working
Merge pull request #56 from erumble/fix/one-person-per-contest

Fix/one person per contest