Updating
Merge branch 'master' of https://github.com/CloudCircle/barbekost

Conflicts:
	application/views/template.php