Merge branch 'Front-End'
Current page isotope functionality
Merge branch 'master' into Front-End