routes and html5 pushstate
conflict
comments added
conflict
some fixes based on jshing warnings