Html fix(adaptive window resize)
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/stylesheets/admin.css.scss
	app/assets/stylesheets/journal.css.scss
	app/views/journal/index.html.erb
	app/views/tests/edit.html.erb
	app/views/users/admin.html.erb