tpl vars
Merge branch 'master' of https://github.com/xaguilars/bootstrap-cms

Conflicts:
	inc/bscms.php