Added QR Code scanner to "New Token" page
Find secret with regex
Fixed error in secret regex
Update config.js

Allow scanning of 16 & 32bit keys
Merge remote-tracking branch 'upstream/master'

Conflicts:
	webapp/config.html
resolved conflict
Increased max token size to 64
Merge branch 'master' of https://github.com/paddy2k/pTOTP into paddy2k-master
Merge branch 'bahayman-master'

Conflicts:
	webapp/config.html