Removing JSP code, adding simple text for a simple demo...
Merge pull request #361 from patriot1burke/master

remove ups social dependencies
Merge pull request #364 from patriot1burke/master

add aerogear stuff
Merge pull request #362 from matzew/JSP-Error

Removing JSP code, adding simple text for a simple demo...
aerogear fix