Re-organizing actions and processing functions
Merge branch 'release/1.2' of github.com:affiliatewp/AffiliateWP into release/1.2