add ApplicationHelper
merge develop