Merge remote-tracking branch 'origin/eclipse-integration'
Merge branch 'master' of github.com:zeapo/Android-Password-Store
Some other Eclipse integration, modified AndroidManifest.xml to match build.gradle information (app version, sdk version)
Added "Show Time" preference and changed default to 45 to match pass