name of project changed
Merge branch '1.1' of https://github.com/paulholiday/Local-Heroes.git into 1.1
JSTL output in JSP instead of horrible markup string generation in Java