Merge pull request #412 from superrbstudio/1.2/develop

Set correct location of redirect JS file
Fix frontend category and brand pagination
Fixed spacing