AngularJs

merging develop into master