Healer attack frame updated to have staff in combat frame
Merge branch 'master' of https://github.com/SyntaxBlitz/apcs-2014-final