Remove show Password

fixes #267
Adding second user for settings test

see #268 and #260
Merge branch 'master' of https://github.com/hypery2k/owncloud

Conflicts:
	roundcube/src/main/php/js/userSettings.js