update
Merge branch 'master' of https://github.com/firmantok/dev1

Conflicts:
	application/views/app/_layout_main.php
	sql/db_rab.sql