Re-enable idle timeout, update russian currency symbol
Merge branch 'master' of https://github.com/mastercoin-MSC/omniwallet

Conflicts:
	www/js/LoginController.js
Merge pull request #1176 from achamely/master

Re-enable idle timeout, update russian currency symbol
Merge pull request #1177 from mastercoin-MSC/master

Sync to master