merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	Q-Bank/View/FormMain.Designer.cs