testing
testing
Merge branch 'master' of heroku.com:iglaset-beta
changed authlogic url