merge plyj updates into cloned
update parser generated files
replace ngroute with mainctrl
remove angular-route depedencies