Setup base of all granular settings
Merge branch 'refs/heads/dev-1.3.6' into granular-settings

* refs/heads/dev-1.3.6:
  Set flex slider JS to only load when short code is used
  Updated read me upgrade info
  Added classes from original pull request
  Added alternate styling when meta box edit fields at not enabled

Conflicts:
	assets/css/wpba-admin.css
Added checks for granular settings