Card #48 Added delete token and security features
Merge remote-tracking branch 'origin/develop' into develop