Design Fixes
Merge branch 'master' of github.com:fashioncache/fashioncache

Conflicts:
	cashback_method.php