fix for map and projectid
Merge branch 'master' into community
refresh from master
merged submission for annouce winner modal appirio-tech/lc1-project#177
Merge branch 'master' into 177_mergetest

Conflicts:
	server/appirio_node_modules/tc-server-auth/index.js