Updates the UI using Clank
Merge branch 'master' of https://github.com/hsientsungwu/MaBow

Conflicts:
	frontend/templates/header.template.php