Merge remote-tracking branch 'upstream/master'
updated .gitignore
Merge remote-tracking branch 'upstream/master'
rename test/helper to test/test_helper
change the whole testing environment
remove unused test
update gitignore
fix the name of the exception
delete unused test files
first try to get the tests running but with less luck
do not comment that line
partly fixed devise in tests
fixed tests
refactor error handling

there have been some missing class definitions in the
other PR. Now fixed.

Conflicts:
	app/models/cms/fortress/error.rb
	app/models/cms/fortress/settings.rb
remove folder db from gitignore
fox test for settings
added generator options to copy development files and documented this in the README
updated schema
added dev db to gitignore
added missing belongs_to association to roles