Update README.md
Merge branch 'release/Release_Fix'
Merge branch 'master' into webqa

Conflicts:
	README.md
Merge branch 'develop' into webqa
Merge branch 'develop' into webqa
Merge branch 'develop' into webqa
Release_1.0
Merge branch 'develop' into webqa
Merge branch 'develop' into webqa
Merge branch 'develop' into webqa
Merge branch 'develop' into webqa
Merge branch 'develop' into webqa
Merge branch 'develop' into webqa
Merge branch 'develop' into webqa
Merge branch 'develop' into webqa
Merge branch 'webqa' of https://github.com/anthonymonori/cs2012-sem4-exam into webqa
Merge branch 'develop' into webqa