tes
revised backend
ignore
ignore2
ignore3
Merge branch 'master' of https://github.com/nickyudha/haparchitects

Conflicts:
	.htaccess
	admin/custom/static/general.php
	admin/custom/static/header.php