Merge branch 'AdeelTariq-alpha' into HEAD

Conflicts:
	statusWindow.py

Signed-off-by: Adeel <adeeltariqagain@gmail.com>