Merge pull request #71 from sneadcj/master

Fixing login and user list for Owncloud One Time Password
Revert "Fixing login and user list for Owncloud One Time Password"
Merge pull request #72 from loki36/revert-71-master

Revert "Fixing login and user list for Owncloud One Time Password"
Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	user_otp/js/utils.js