Use greet in appcontroller
Merge branch 'master' into greet_rewrite