Updated vars
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/home.tpl
Updated vars