update for App Framework
Merge branch 'master' of github.com:01org/appframeworkMVC