fixed wagn command and rake tasks
working on diff
Merge remote-tracking branch 'upstream/master' into improve-specs
working on diff
use new capybara version in Gemfile
added rspec settings to .tm_properties
Merge branch '1.14.1' into improve-specs
working on diff
db seeds for history tests
working on diff and history
Merge branch '1.14.1' into improve-specs
added history cuke
content_changes view for js and css
eof
bugfix
corrected history spec
Wagn performance logger
Merge branch 'master' into wikirate

Conflicts:
	lib/wagn/tasks/wagn.rake
	lib/wagn/version.rb
Merge pull request #261 from xithan/wikirate

merge branch master into wikirate
turn performance logger off by default