Adding support for defining URL for plan, quota and pricing period
Providing more search fields for admin.
Adding more filter options
Merge remote-tracking branch 'upstream/master'