Merged the final version of the login into the master

Squashed commit of the following:

commit 527db31587d97dea4a60d3a39286d4726be546fd
Author: Kenneth Radunz <kenneth.radunz@web.de>
Date:   Thu Mar 14 08:09:05 2013 +0100

    added a comment to the Login class

commit 922b12b3dd072519a2eaa4ff35f61b136bb08154
Merge: 1f8bb93 17d659c
Author: Kenneth Radunz <kenneth.radunz@web.de>
Date:   Thu Mar 14 08:00:12 2013 +0100

    Merge branch 'master' into LoginAdminUser

commit 1f8bb93227cf322aead15eb3f3830c33d946c55c
Author: Kenneth Radunz <kenneth.radunz@gmail.com>
Date:   Wed Mar 13 14:24:12 2013 +0100

    tests now work

commit 6756003c1e29aed113c04900b24896fe0ca7556e
Author: Kenneth Radunz <kenneth.radunz@web.de>
Date:   Wed Mar 13 09:50:25 2013 +0100

    made my test work and pass

commit 15ad0d987444c3c8a0369b4eadbcad7d06b98733
Merge: 0fee2b7 f291981
Author: Kenneth Radunz <kenneth.radunz@web.de>
Date:   Wed Mar 13 08:28:45 2013 +0100

    Merge branch 'master' into LoginAdminUser

commit 0fee2b7fe15c32df26c369c3a7af7d911445d773
Author: Kenneth Radunz <kenneth.radunz@gmail.com>
Date:   Tue Mar 12 13:19:21 2013 +0100

    tried to bring a test to run
changes actors list and tuned german translation
cleaned routes
created an actor to_s that works both for hospitals and doctors. needs serious refactoring and rethinking how we want to handle this for future extensions of the ActorType. should be good enough for tomorrow though
Merge remote-tracking branch 'origin/model_controller_coordination' into model_controller_coordination
Theres only one way to solve merge conflicts! reset --hard!
missed this
merge into master and final tweaks in T-1h, stay tuned, I need a break
actor update flash message
started with update actor_type, won't be ready for tomorrow, feature hidden until done
Merge remote-tracking branch 'origin/master' into model_controller_coordination

Conflicts:
	spec/models/actor_spec.rb
Merge remote-tracking branch 'origin/model_controller_coordination'
csv import base

needs to be extended to use different params
extended .gitignore to public/uploads/
added some model stubs for csv import
first chunk of refactoring as discussed in team meeting
started with relations and relationship_types
added class
doesn't work yet...
that should do the trick