2fa removed
Merge branch 'develop'

Conflicts:
	2fa.html
test file added
test files removed
test files removed
test folder
3 removed
test files removed