commit
Merge branch 'master' of https://github.com/twocngdagz/BBT2013

Conflicts:
	core/view/home.php