building temporary save
middle point
middle point
middle point
middle point

Conflicts:
	application/models/user_model.php
	application/views/templates/footer.php
middle point

Conflicts:
	application/views/templates/footer.php
middle point

Conflicts:
	application/views/templates/footer.php
middle point
middle point
middle point
middle point
middle point

Conflicts:
	application/models/curriculum/course_model.php
middle point
middle point
middle point
middle point
middle point
temporary fixed angularjs way of booking facilities
temporary middle point
middle