Merge branch 'master' into community

Conflicts:
	server/appirio_node_modules/tc-server-auth/index.js
copy changes and some spacing adjustments to challenge edit/create page
merging in order to get my content and spacng fixes in
Merge pull request #21 from appirio-tech/322_EditChal

Copy & spacing changes to Edit Challenge page