Did some responsive adjustments
Merge remote-tracking branch 'origin/master'

Conflicts:
	static/.webassets-cache/258aab769834d97cfe714f49b152e9e2
	static/.webassets-cache/4a391347747e6a7bc50ef5738566e182