latihan
Merge branch 'development' of https://github.com/egisolehhasdi/Website-SMKN-4-Bandung into development

Conflicts:
	application/layouts/scripts/layout.phtml
	application/views/scripts/index/index.phtml
layout
Merge branch 'development' of https://github.com/egisolehhasdi/Website-SMKN-4-Bandung into development
model
Merge branch 'development' of https://github.com/egisolehhasdi/Website-SMKN-4-Bandung into development

Conflicts:
	.zfproject.xml
aa
Merge branch 'development' of https://github.com/egisolehhasdi/Website-SMKN-4-Bandung into development

Conflicts:
	application/layouts/scripts/layout.phtml
edukasi
Merge branch 'development' of https://github.com/egisolehhasdi/Website-SMKN-4-Bandung into development

Conflicts:
	application/layouts/scripts/layout.phtml
	application/modules/admin/views/scripts/highlight/form.phtml