added hiddenIdSuffix to hidden input
Merge branch 'refs/heads/gh-pages' into dev