Dev

need jAngular edit merged into master