"added friendly forwarding and other things"
Merge branch 'master' of github.com:jingar/sample_app