---jihan
Merge branch 'master' of https://github.com/choirudin2210/siaek

Conflicts:
	images/Feedback.png
	images/Perbandingan Rekapan.png
	images/Photo.jpg
	images/Rekapan.png
	images/calendar.JPG
	images/deadline.png
	images/graph.png
	images/img_datepicker/custom_b.png
	images/img_datepicker/custom_bl.png
	images/img_datepicker/custom_br.png
	images/img_datepicker/custom_l.png
	images/img_datepicker/custom_r.png
	images/img_datepicker/custom_t.png
	images/img_datepicker/custom_tl.png
	images/img_datepicker/custom_tr.png
	images/img_datepicker/datepicker_b.png
	images/img_datepicker/datepicker_bl.png
	images/img_datepicker/datepicker_br.png
	images/img_datepicker/datepicker_l.png
	images/img_datepicker/datepicker_r.png
	images/img_datepicker/datepicker_t.png
	images/img_datepicker/datepicker_tl.png
	images/img_datepicker/datepicker_tr.png
	images/img_datepicker/field.png
	images/isi_absensi.png
	images/kegiatan.png
	images/logo1.jpg
	images/p.gif
	images/pengurus.png
	images/peserta_didik.png
	images/regional.png
	protected/controllers/UserController.php
	protected/models/User.php
	protected/runtime/application.log
	protected/views/layouts/main.php
	protected/views/site/index.php
	protected/views/user/updateProfile.php
	protected/views/user/viewProfile.php