waqas
Merge remote-tracking branch 'origin/master'

Conflicts:
	Common/css/style.css
Merge branch 'master' of https://github.com/mustafazaki/amber_website
Merge branch 'master' of https://github.com/mustafazaki/amber_website
waqas
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	Common/css/style.css
New changelist
Merge remote-tracking branch 'origin/master'

Conflicts:
	Common/css/style.css
New changelist
Merge remote-tracking branch 'origin/master'