synced to latest AF files
Merge branch 'master' of https://github.com/krisrak/appframework-templates