Updated style, modify html code
Merge branch 'develop' into feature/developerMode-and-repeat

Conflicts:
	system/css/seotoaster.css