change gps wait to modal
Merge branch 'wow-develop' of https://github.com/BCATeamHTHS/Dogecache

Conflicts:
	public/js/map.js
[new] added modal close on click outside
[fix] changed methods in history model to accept user rather than fbid for consistency
[fix] check if array in cache.js
[fix] added async to stats.js
[fix] misc
Merge remote-tracking branch 'origin/master'

Conflicts:
	routes/stats.js
Merge branch 'master' into wow-develop
Revert "change gps wait to modal"

This reverts commit b04ed72bc51a79b6c879b307e0c79b280a107fbe.

Conflicts:
	public/js/map.js
Revert "change gps wait to modal"

This reverts commit b04ed72bc51a79b6c879b307e0c79b280a107fbe.

Conflicts:
	public/js/map.js
fix variable declation
[new] doge amount updates clientside, displays doge received in results modal
Merge remote-tracking branch 'origin/wow-develop' into wow-develop
fix variable declation
merge fixes
broken commit
Merge remote-tracking branch 'origin/wow-develop' into wow-develop
[fix] merge issues
Merge remote-tracking branch 'origin/wow-develop' into wow-develop

Conflicts:
	public/js/map.js
fix circle radius at high zoom levels
Merge remote-tracking branch 'origin/wow-develop' into wow-develop
[fix] moved facebook clientid and clientsecret to config.json
Merge remote-tracking branch 'origin/wow-develop' into wow-develop