changed url in access token, removed spring-servlet.xml

fixed url in access_token, some changes in spring-servlet weren't really
needed so removed it.
Merge remote-tracking branch 'origin/master'