sakaiproject/3akai-ux — pull request #1349 by liyushan (2011-12-04 02:24:25+00:00)
Title: Fix conflicts, SAKIII-4082: put hashed resources in processed-resources ...

Fix conflicts.
put hashed resources in processed-resources directory and uxloader.jar