Merge branch 'master' of github.com:albertcui/yasp into iss-44

Conflicts:
	views/match.jade
fixed techies skill bug
Merge branch 'iss-44' of github.com:albertcui/yasp into iss-44
Merge branch 'iss-44' of github.com:albertcui/yasp into iss-44
Merge branch 'iss-44' of github.com:albertcui/yasp into iss-44
reorg'd details page, async timelines