Dev9

jAngular rewrite to be merged into dev