temp checkin
temo checkin
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	package.json
add activity fetching logic
Merge branch 'dev' of https://github.com/super132/ActivitySuggest.git
into dev

Conflicts:
	lib/weatherInfo.js
	modules/weather/index.js