Merge branch 'master' of github.com:uyicheng/QZilla
Merge branch 'master' of github.com:uyicheng/QZilla

Conflicts:
	application/views/welcome_message.php