Adding token functionality
Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	src/edu/wcu/cs/agora/FriendFinder/Login.java
Adding token functionality