-Add font-awesome icons
-Rename to "cancel" button on waiting screen
-Remove unneccessary local storage work for the token. It all takes place in the client library
Merge remote-tracking branch 'origin/master'