hero
hero
just a update
Merge branch 'master' of https://github.com/tsr-elion/tsr-ui-frame

Conflicts:
	Elion/assets/styles/Elion.min.css
	src/assets/styles/tsr-bootstrap/_progress-steps.scss
	src/assets/styles/tsr-bootstrap/bootstrap.scss
added angular js, removed fragment.js
update