JSP Manhattan Alpha
Merge branch 'manhattan' of https://github.com/gdufrene/GamePortal.git into manhattan