reinit
rm system.img
add empty untrack file
Merge remote-tracking branch 'origin/master'

Conflicts:
	rootfs_qt4.8/etc/profile
	rootfs_qt4.8/webee_qt/qt