pushing min js and css
Merge branch 'master' into _99_1

Conflicts:
	css/all.min.css
	js/all.min.js