lock accounts for 10 minutes after 10 failed attempts
ignore lockable attrs in import and export
add paper trail for roles, qualifications. fixes #6015, #6016
render extensions on people#history, refs #5948
improved updating participant count, fixes #6352
adjusting translations in navigation_helper
add missing brace
Design person list filters
Person list: edit role direct in table
Left navigation layout
Design log view
Merge branch 'master' of https://git.puzzle.ch/pitc_hit/hitobito
Revert "Design log view"

This reverts commit c34af15189deec2d63fb65946b65481449f740e4.
Revert "Left navigation layout"

This reverts commit a9cef56fcb4128ff0cace7109f541a01990e372a.
Revert "Person list: edit role direct in table"

This reverts commit 4ac86b5bb8e16080f671eb678e0453d8da7337bb.
Revert "Design person list filters"

This reverts commit 3ecdcdd360e0b684c257913a3cc1c4c99a4a1cd8.
update rails gem to 4.0.2, fix some deprecations
update more gems
get tests running on rails 4
update wagons