rre
Merge branch 'dev' of https://github.com/Pandabehr/baasplayer into dev

Conflicts:
	css/style.css
	css/style.scss