Change SRM to Marathon, just for you Tony
fix develop subtrack tab issues
fix incomplete copy/paste error
Merge pull request #240 from topcoderinc/patch-I-108145

fix develop subtrack tab issues
Merge branch 'dev' into quesks-I-107026-incorrect-contest-type-tooltip-color
Updated link to forgot password page to use ssl
Merge pull request #246 from topcoderinc/tom-I-114497-force-ssl-pwd-reset

Tom i 114497 force ssl pwd reset
Hard-coded country logic on front-end
Removed php ajax functions for getting countries
Fixed formatting
Merge pull request #249 from topcoderinc/tom-I-113882-fix-country-list

Tom i 113882 fix country list
Merge branch 'TC-2014-05-01' of github.com:topcoderinc/tc-site into dev

Conflicts:
	wp-content/themes/tcs-responsive/js/init-header.js
	wp-content/themes/tcs-responsive/js/script-member.js
Merge branch 'quesks-I-107026-incorrect-contest-type-tooltip-color' of github.com:topcoderinc/tc-site into quesks-I-107026-incorrect-contest-type-tooltip-color
Merge branch 'dev' into quesks-I-107026-incorrect-contest-type-tooltip-color
Fix code formatting