refactor to enable use of both types of Fragment (support lib & android.app)
Merge remote-tracking branch 'origin/master'