merging
merging
Merge branch 'pemula-194965-upcoming-challenges-clean' of https://github.com/topcoderinc/tc-site into pemula-194965-upcoming-challenges-clean

Conflicts:
	wp-content/plugins/TcApi-hookup/includes/ajax_func.php
	wp-content/themes/tcs-responsive/page-challenges-upcoming.php
clean up conflict
fix loss of code and make upcoming challenge work