branddestroy
Merge branch 'blackwindows/test-master' into test-master

Conflicts:
	app/views/blogList.php
clean
billist
fix bug