aslı - commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	Styles/Common.css