Merge conflicts, bootstrap 3.0.2, UI/UX tweaks
Merge branch '20130703---After-a-long-time' of https://github.com/OpenInstitute/OpenDuka into 20130703---After-a-long-time

Conflicts:
	application/controllers/admin.php
	application/controllers/homes.php
	application/models/admin_model.php
	application/models/home.php
	application/views/admin.php
	application/views/api/api.php
	application/views/api/footer.php
	application/views/api/header.php
	application/views/footer.php
	application/views/header.php
	application/views/home.php
	assets/css/custom.css
	assets/js/jquery-ias.js
	assets/js/renderer.js
	assets/styles.css