Topcoder NodeJS User Activation Email API
Merge remote-tracking branch 'upstream/dev' into user_activation_email_api

Conflicts:
	routes.js
Merge pull request #367 from Ghost141/user_activation_email_api

user_activation_email_api