Merge branch 'master' into Kevin
Merge branch 'master' into Kevin
Merge branch 'master' into Kevin
changed timeout div / changed tooltip style
Merge branch 'master' into Kevin
Merge branch 'master' into Kevin

Conflicts:
	assets/javascript/main/stub.js
	assets/stylesheets/sections/_header.scss
conflict
nothing
Merge branch 'Kevin'