homiletics 1
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/library/Lesson.php
	app/views/parts/dbi_nav.blade.php
fixed conflicts