Added code that was present before reset
Merge remote-tracking branch 'github_repo/master'
Added maven dependency to pom.xml to attempt to support tomcat's base64
library.
Removed wrong dependency and added actual one that was needed,
tomcat-coyote library