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

Conflicts:
	Elion/_sidemenu.html
	Elion/assets/scripts/Elion.min.js
	Elion/assets/styles/Elion.min.css
	Elion/index-with-sidebar.html
	Gruntfile.js
	src/_sidemenu.html