Master Pages: Java Script Includes UI changes and backend changes
Merge branch 'master' of https://github.com/nathanielasare/generationflux