Fix the confusing menu
Automatically load the last database
Merge branch 'master' of https://github.com/keepassx/keepassx

Conflicts:
	src/main.cpp
Implemented core code for timed lock
Add gui for auto-lock settings
Add timer reset for most GUI events
Only edit on double click, not single
Improved menus with separators
Fix text alignment in SettingsWidgetSecurity.ui
Merge branch 'master' of https://github.com/keepassx/keepassx
- update for testing branch
Added settings for automatically loading the database
Fix CategoryList minwidth for settings
Some improvements to the welcome message
Fix bug where recent database list not getting updated causes a segfault