edit
Merge branch 'master' of https://github.com/rohmanahmad/bbm_db_reader

Conflicts:
	application/modules/bbm/models/bbm_model.php
	application/modules/main/views/header.php
modify