so many changes....I dont even know how to characterize these.Javscript, routing, new application side code. Just a bunch of good stuff
merge conflict resolution