Fixing Issue 123 https://github.com/TeamMentor/TM_4_0_Design/issues/123
Removing only property that was added for testing purposes
Merge remote-tracking branch 'upstream/master' into Issue_123_TermsAnd_Conditions

Conflicts:
	QA/tests/regression-sprint-1.coffee
Deleting temp file added mistakenly by the merging tool
Removing only property so all test will run
Merge pull request #133 from michaelhidalgo/Issue_123_TermsAnd_Conditions

Fixing Issue 123 terms and conditions