added ng annotate
added sourcemaps to js files
merging