boostrap
Merge branch 'master' of https://github.com/kamudrikah/zaki_rest

Conflicts:
	application/views/main_index.php
a