database configuration
Merge branch 'master' of git://github.com/simonwacker/HEK
Merge branch 'master' of git://github.com/simonwacker/HEK
passwords
passwords
Merge branch 'config'

Conflicts:
	app/controllers/application_controller.rb
Merge branch 'master' of git://github.com/simonwacker/HEK
Merge branch 'master' of git://github.com/simonwacker/HEK
Merge branch 'master' of git://github.com/simonwacker/HEK
Merge branch 'master' of git://github.com/simonwacker/HEK
Merge branch 'master' of git://github.com/simonwacker/HEK
Merge branch 'master' of git://github.com/simonwacker/HEK
Merge branch 'master' of git://github.com/simonwacker/HEK
Merge branch 'master' of git://github.com/simonwacker/HEK
Merge branch 'master' of git://github.com/simonwacker/HEK
Merge branch 'master' of git://github.com/simonwacker/HEK
Merge branch 'master' of git://github.com/simonwacker/HEK
Merge branch 'master' of git://github.com/simonwacker/HEK
Merge branch 'master' of git://github.com/simonwacker/HEK
Merge branch 'master' of git://github.com/simonwacker/HEK