replaced Rails.root with Wagn.root
added no_search_results view for search_type cards
need this to overwrite it for the filtered search in wikirate
Merge pull request #232 from xithan/search

added no_search_results view for search_type cards
rule editing notification wording tweak
Merge remote-tracking branch 'wagn/wikirate' into wikirate
added option to generate card migration with json import
If the card migration name matches import_(.*)_from_(filename:.*) then the
migration is set up to import json data from db/card_migrations/data/<filename>.json
cucumber for decks
css tweak, custom migration cleanup
settled migration merge conflict
fixed mail config bug
added javascript debug mode
?debug=script to enable js debug mode
?script=my-js-card to load only js in my-js-card instead of js rule
tweaked wagn new command
touched up wagn generator again
Merge branch 'wikirate' of https://github.com/xithan/wagn into wikirate

Conflicts:
	mod/04_settings/set/self/options.rb
replace "locals" with normal nests in emails
eof
resolved merge conflict with migration generator
fixed card migration generator
Merge remote-tracking branch 'xithan/sysmail' into wikirate
corrected usage info for card migrations