Fixing user list underflow problem
Merge pull request #199 from khawkins/fix_hybrid_template_app

Fixing user list underflow problem
Merge branch 'unstable'