re #5 #2 Observer to retrieve the User's permissions (Resources) and check whether those Permissions are on the list of protected Resources. If so, redirect to a new controller for input of credentials
Merge remote branch 'origin/master'

Conflicts:
	src/app/code/community/MageHackDay/TwoFactorAuth/etc/config.xml
Merge remote branch 'origin/master'