zh-TW injection on 20140509-004936
Revert "ECMS-4880: Remove unused import lib"

This reverts commit 793cce83476e6c5655359a7e9b9d7bba66a80350.
Revert "ECMS-4880: Fix on rest service"

This reverts commit 10b6363ef7d20edb93af8bcb9de9ff7f7672e246.
Revert "ECMS-4880: Cannot go directly to a user folder with username as email address"

This reverts commit d2f4952010eddd725948a20a37fcced7021b941c.
Merge commit '3e922cb2143ea79a609a42179f28718d80fd8469' into HEAD
Merge commit '3f12f7043863403bdf5574a96eb5fbbbb13c1b0d' into HEAD