rspec test, capybara and integration test added
factory_girl and some rspec tests
changes
master pull github
development merged in master
tegel branch created
AddLockedToUsers Migration and rspec fixes
rspec fixes
Active admin user side modified -> lock mode and admin mode added
Admin button added
author controller with actions and views list and show added and implemented
added some rspec tests
merge + fix merge conflicts (tegel)
fix merge conflict (tegel)