DB/Fix conflicts and fucked nav bug
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/controllers/home.php
	application/views/template/nav.php
	db/db_bba.sql