content class
Merge branch 'master' of github.com:tsr-elion/tsr-ui-frame

Conflicts:
	Elion/assets/styles/Elion.min.css