rupture integration fixed, nav responsive
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/jade/mixins/navigation.jade
	app/stylus/main.styl