Merge origin/master

Conflicts:
	application/config/autoload.php
	application/config/config.php
	application/controllers/access/login.php
	application/controllers/access/password.php
	application/controllers/home.php
	application/helpers/common_helper.php
	application/models/access/manage_users.php
	application/views/templates/header.php
	application/views/templates/side_bar.php
	assets/css/bootstrap_tweaks.css
	assets/css/main.css
Merge origin/master

Conflicts:
	application/config/autoload.php
	application/config/config.php
	application/controllers/access/login.php
	application/controllers/access/password.php
	application/controllers/home.php
	application/helpers/common_helper.php
	application/models/access/manage_users.php
	application/views/templates/header.php
	application/views/templates/side_bar.php
	assets/css/bootstrap_tweaks.css
	assets/css/main.css
Merge origin/master
Merge origin/master

Conflicts:
	application/config/autoload.php
	application/config/config.php
	application/controllers/access/login.php
	application/controllers/access/password.php
	application/controllers/home.php
	application/helpers/common_helper.php
	application/models/access/manage_users.php
	application/views/templates/header.php
	application/views/templates/side_bar.php
	assets/css/bootstrap_tweaks.css
	assets/css/main.css
Merge origin/master
Merge origin/master

Conflicts:
	application/config/autoload.php
	application/config/config.php
	application/controllers/access/login.php
	application/controllers/access/password.php
	application/controllers/home.php
	application/helpers/common_helper.php
	application/models/access/manage_users.php
	application/views/templates/header.php
	application/views/templates/side_bar.php
	assets/css/bootstrap_tweaks.css
	assets/css/main.css
Merge origin/master